Started with pruning.
Fixed up parens a bit, and threw some more tests together.
Bit of restructuring.
Some more tests, and more restructuring.