New files are same as old (except for whitespace differences), except that the new GENERIC doesn't have melody, because GENERIC defines DRACO and the latter can't have it.
