Tiny perf. improvement. More coming soon.