c8b6f4733d
- only replace same-scope usages - augment `test/ufuzz.js` to test for `this` fixes #2420
- only replace same-scope usages - augment `test/ufuzz.js` to test for `this` fixes #2420