Split form fields for OrderedRich and RichEnums

Require callers to be explicit about which type of field they'd like.
Drop support for passing old-style dict-based enums to form fields.