Some more work on enums integration.