More micro-optimizations