I don't see the benefit of your suggestion (yet), we need to access ``wallet`` for processing the address stuff, so that code belongs to ``WalletModel`` IMO.