The prereqs in general should be made more modular; that's out of scope for this PR.