Hello
Simple patch and looks good, just one very minor about this comment:
/* reject conflicting "-only" options */
I would either remove the comment or the "-only" part, as that's no longer true.
(I see that it was there earlier in the later if, and it was similarly
incorrect. So this is not new with the patch, but still seems wrong)