Remove => (for now) and clean up the code a bit.

This is still not even close to ready for a PR, but at least
there should be less random diagnostic spew going on. It is
working better than I expected.