This represents an incremental improvement over the current state.
However, there's more work to be done in terms of restructuring/reordering
to present the information in an easier to digest as well as apply the new
facilities effectively. This future work will be tracked in #4944.

[skip ci]