Add another couple of pointless optimizations.