Small performance gains, some style fixes
Merge branch 'master' of github.com:clojure/tools.reader