Fix s-match-strings-all, this time properly