Don't just rely on a comment next top the code, do an assert as well. Also, don't use `default` since that silences compiler warnings when new enumerators are added and related code is to be verified. More switch statements might need an adjustment, but this is something what is easier to go over by Pablo.