Clean up some hotspots
Merge pull request #91 from dstockwell/more-faster

Clean up some hotspots