A few more optimizations.