Better case-of-case transformation