Remove unused if() since the "equal" case is handled in the following
switch. And add the "comma" test to switch.