Reorganize patches

Follow-up to !64 (merged). Shuffle patches around so that such mistakes are harder to make in the future.

Note that the name "forward" is somewhat arbitrary, and I'm very open to changing it if there are better suggestions.

Although it's not a real blocker, I would like for this to be part of the 6.6.0-1 upload.