Add a switch which controls which operation to perform.  Useful to test
only a single feature. Also the new behavior is more self-consistent.