Couple more minor optimizations.