Is this just fixing up whitespace?  Can it be a separate commit?