I've decided to make this change wholesale (i.e. pass the account around everywhere rather than the client): 0320181

WDYT?