More performance optimizations.