Eliminating some more boilerplate and using new callback flow for wallets