misc hmm cleanups

[Christoph Hellwig <hch@xxxxxx>]

Hi Jason,

I started looking at bits in my backlog that shouldn't get too much
in your way.  Here is a bunch of simple patches, on top of the series
you sent out.