Make it works on an instance and per query/request

So: very confusing situation with an instance method options and an
options parameter
Also: confusing case where options only could be the content_type, but
the caller did not in fact remove everything but the content_type, while
the callee relied on it