Fix #1114: Verify contents of interop annotations
Cleanup annotation classes