As title. Too tired to summarize here, but it suffice to say that the 2000-line patch has landed, and it has again touched pretty much all of evaluator code -- hurray for the test coverage and typechecking that lets me refactor^Wrewrite mercilessly. I'll keep you posted...