The way that the bill contact details and distributor address are set for pickup orders has changed. At this point, after before_save_hook is called, the bill contact details have already been set as well.