Minor fixes

- Changing the order of the first two parameters for `this.proxy()`
- Removed `var self` lexical scope pattern by binding everything
- Fixes #209 
- Fixes #210