Whitespace, indent, <80 col

No substantive change. Just code formatting OCD.
Add a couple more unit tests for ~> and macros.