Started refactoring of common annotation processing.