Fix compilation after enum values moved into enum scope

Follow rust master.