Moved more functionality over to StorageFormatManager.