ElementType.TYPE annotation support, closes #571