This fixes a typo in 81d69e1b. Of course we should only skip the particular store if it isn't removable, not bail out of the whole loop. Add a test to cover this case.