I moved the files over and ran the formatter, which produced a diff large enough that the mailing list rejected it when I bundled it with the first commit. I could split things up more, but that would lead to an extra 2 or 3 patches in this series that contain formatting unrelated to the problem, simply because unformatted patches are getting merged. I hadn't anticipated needing granularity in the formatter because nothing except what you just worked on was supposed to be changing when you ran it, and the tools we're using don't support parts of a file.