Add support for 'primary' and 'migrate' account storages. Fix two bugs in the text storage backend that were introduced by my previous changes.
