a few style fixes

Some minor style issues I discovered while making the patch set for lkml.