Follow the change in argument order for `switch`