Even more optimizations.