Remove a lot of cruft acquired during debugging the yarr versus repa
problem.