Some more pocket refactoring and cleanup, removed internal management of change addresses.