Rearrange lexical scoping (fixes #202) #204

Merged
mbutterick merged 3 commits from fix-drp into master 5 years ago