CTL-505 Small performance improvements.