Minor nit: if I map ```this``` to a local/closure variable (like ```self```), then I try to use the local variable everywhere. This avoids errors if, e.g., some code that wasn't in a closure later gets moved inside a closure.

I'll fix this.