Small performance improvements.