More optimizations.