Simplify some code + update a few comments

We were doing some crazy tuple matching business in
StorageStatus#updateStorageInfo. We should try to avoid that for
code readability.