Upgrading to 3.x requires non-trivial modifications, so I took
the (slight) extra time to make us less dependent on future
changes (and possibly solving robustness issues for free).

Refs: #15022, #10475, #11697