Reorganize patching and targets

There are so many targets here that it's really hard to follow. Move the
OPTIONS-related stuff away from the basic targets, and separate out a
couple patches into more sensible targets so that it's clearer what things
are doing.