Further optimizations.