More perf enhancements.