Tighten up WorkflowBuilder types.

Mostly: don’t use a disjunction where we don’t need it.