Some cosmetic optimizations.