PR fixup: DRYer forwarding of sauce vars