Merge fixups
Fix computing where aliased body level lets start in Bindings
global-level lets still need to be vars until other bugs are fixed
Spot fix a test