Additional optimizations.