Making progress on addr160->scrAddr upgrades