Yet more optimizations.