Fix yet another variable naming error.
Port `comparison` and `switch`.