Fix for new enum namespace rules.