Extra optimizations.