Moving to workflowstepspec in more places