Minor perf improvement