Auto merge of #153383 - nnethercote:overhaul-ensure_ok, r=Zalathar

Overhaul `ensure_ok`

The interaction of `ensure_ok` and the `return_result_from_ensure_ok` query modifier is weird and hacky. This PR cleans it up. Details in the individual commits.

r? @Zalathar

Author: bors