Better handling of OPTIONS pre-flight requests?