Allow annotations to be enabled or disabled on visitor.  Disabled by default.
Fix broken tests and PMD rule violation