This series has a couple of minor cleanups which have been lingering around in my tree for a while. None of them should cause any change in behaviour.