Small perf improvements (~5%)