FIXUP: check-storage.