Remove some pointless micro-optimizations