Changed everything to work with the new PerBlockStorageManager.