Use enums for members that clearly should have been so from the beginning

[moggers87]

The compiler can catch more mistakes and the code is easier to read

Also we already have -Wswitch-enum enabled