Small optimization to storageExpansion