To ease understanding of changes, I've merged master into syntax-control, and pushed the result.

Please LMK if there are any issues with this. The resulting branch passes all the regression tests (haven't tested updates).

cheers, r