Easy split off portion from the macro PR
Fix typo
Finally get test output under control
Get a good error msg, update test
More quietness
Merge pull request #1130 from twitter/ianoc/smallerSplitOff

Some minor changes, cleanup pulled from jco's macro branch