Small performance enhancements