Revert "oops, committed something that doesn't parse..."

This reverts commit 1c41a84008b100d405d026b5a23de7ec9e5a2d45.
Revert "some attempts to speed things up by moving lets into wheres..."

This reverts commit e73b99ac8c438d8c170fe2eca7c12805266727e4.