Tiny perf optimization in #4. Solved #5.