- move the enums - expose the named-enum functions for them - **start** replacing Descriptor with something stronger; this fails zero tests so it obviously wasn't tested at all