Rolling back to before I started the delayed-evaluation stuff. Didn't checkout an older commit because I wanted to keep some of the new stuff.