Do a pass on performance

[tshprecher]

Once the grammar is correct, I'd like to do a pass over the tests to improve performance. We've seen high variance in the time it takes to run tests based on seemingly innocuous changes. If there's some recursion would could avoid, we should.

This would involve adding timing data to each test and check for outliers.