Annotation info cleanup and increased code coverage of Info namespace.