Remove separte hauleeWithHauler and haulerWithHaulee, combined into
haul.