Fixup formatting and comments from reviews of recent patches