Use switch statements rather than oneOf function.

Testing for membership in a small set like this is an idiomatic
use for switch statements. Also, converting to switch statements
revealed a couple places where we were taking the wrong action for
expireA. These cases were caught by the compiler when expireA appeared
in multiple case expressions.