minor refactoring of duplicated currency code
relying on the internal account key when possible