Fix typers for distinct[By].
Simplify some WorkflowBuilder operations.

Also enable one previously pending test.