Move use of priceSetID & amount_override to where they are used