More prep for BTC payment code path