More tiny optimizations.