Fix #13721. Filter set before remove so positionals work.

This seemed too easy. So what did I do wrong?