A couple more optimizations.