Cleaned up annotations to align with new Pillar annotation semmantics that allow new annotation-types/styles to be defined without changing Pillar code.