Fix generic setup dependency order.