Wallet: add output shuffling (a second time - where did it go?!). It's optional for unit testing.