Small perf tweaks.
8 files changed