:+1: Thanks for all this clean-up. These are tiny performance optimizations, which are probably wise, though I default to => for callbacks and loops because it seems like a good place for lexical scoping of `@` even if `@` is unused.

Next time, though, try and put these in a separate PR. It makes it much easier to review if all the changes have to do with one bit of new functionality, rather than a hodge-podge -- particularly for completely unrelated files, like this one. :)