more micro-optimizations