Fix new enum scoping rules