Properly handle M3 / EV1/2/3 room numbers.