Fix #1114: Verify contents of interop annotations
Cleanup annotation classes
Merge pull request #1118 from gzm0/error-check-annots

Error check annots