Another small perf improvement