WyC: curiously enough, my previous refactoring have exposed some test cases which are syntactically incorrect.  Currently going through and fixing them.