Merge branch 'wasabiz/refactor/peep-hole'
partially revert incorrect generalization introduced in commits 14cba65 and 8255bd6 while keeping the good impl. (note: creation of closures can be delayed in _this_ context)