Merge "Switch several enums to enum classes"