Some smaller optimizations.