Partial refactoring of declarations.