Wallet and TrustPool definitions are now /almost/ entirely where they belong.