Just a few optimizations.