Some more optimizations.