A few more micro-optimizations/