PillarChange/SwapMove should take vale ranges into account: upgrade recipe