Remove questionable micro-optimizations