@skmetz I suspect this is not shameless enough

After 4 tests I could not help myself but do some refactoring. Do you
want us to encourage them to write a 12-branch case statment for their
first pass?