Fix some perf nits.