Minor Optimizations.