[PATCH 05/11] Streamline some logic in storageInitialize.