Patch Set 1:

Yea, rename detection failed horribly on this change.  The files are really small, and the headers are really big, and the bulk of the header doesn't change since its common to every file.

Anyway, I left the copyright headers in because the files are derived from Robin's work. I took his work, copied it, pasted to the new file, and deleted the other method.  Its derived enough that I felt better leaving his notice than to strip it out.