Reverted a bunch. Refactored some. A few minor drive-by changes. Added two test cases.
Tangent to #33.