Stop cheating in test output.  No fewer failures, though.
Add non-shadowing version of Pixley.  But that's not the problem.