@maxpeterson - We could consider something like#3101 as a follow up to this. I chose not to push that in as part of this change as a consequence of it being unclear what behavior we'd want (or even if wedo want that behavior). As you mentioned:

I am not certain what the behaviour should be

I think the bottom line might be that we wouldn't accept further complications to the already ad-hoc 'OPTIONS' behavior, however I'd be willing to consider a fresh ticket for it if you were so minded and wanted to discuss further.