More perf improvements.