These are cosmetic changes to avoid unneeded diffs between the 2.4
and 2.5 code.  Submitted by Christoph Hellwig