More switch-case command conversion