hadrian: eliminate most of the remaining big rule enumerations