More refactoring, centralizing `Annotations` enumeration