More slight optimizations.