A couple of optimizations.