Fix all occurrences of account.account

Fixes the dereference of account objects with account.account. This is
to conform to recent library changes in Marvin

Signed-off-by: Prasanna Santhanam <tsp@apache.org>