Performance

~~Two small changes~~ One little change that improves performance when working on larger collections.