43810817 configure enums with import

Merged in @marktriggs solution of create_enums context.