Fix predicates for unindexed stores so they don't accidentally match indexed