Further performance improvements.

...formance increase