Simplify filter-store-all by modifying *-store