CSPACE-6266: Yet more resource ordering tweaks, cyclic dependencies are now gone.