Fixed the new `switch` code.
Fixed the new `switch` code.

Still a lot of work to do, but this is at least progress
towards a fix for issue #147.

danfuzz/samizdat,danfuzz/samizdat,danfuzz/samizdat,danfuzz/samizdat