We (Stuart and me) already discussed this, and he's aware that this needs to be fixed.
I think a simple / basic idea is to have SetupActions as part of deployment's attachments,
where each sub-system properly adds them to the underlying deployment.
But I'll let you two discuss the details. :-)