Micro-optimizations #1