Make work wrapInner(fn) work consistently. Fixes #5799.