Minor performance optimizations.