EZP-21213: Early refactoring of ImageStorage