WIP Maybe unbreak #storage.

But not storage-details or the dialogs.