[PATCH 09/13] Move shouldClear into Storage.