Further performance improvements.