Minor cleanup to avoid forward declarations.