test-check 2018-01-18

I reverted the changed that added map-bindings to gen/let