[PATCH 1/2] Fix the botched helperization of StorageChecker