[WFCORE-12] Further cleanup related to deployment-specific marshalling