simplify/clarify formal parameters
unfactor out ConstantDeclarators monkey business.

also, note that AnnotationConstant has same grammar
as InterfaceField, and factor accordingly
reorganize:  put enum and annotation definitions by class and interface ones
unfactor Expression1 and Expression2