Fix compilation after Bob changes on dependence switching