Tons of bug fixes and refactoring. Current test suite all passing, but
many features still untested. Need to finish implementing quantifiers.