Even more perf improvements.