Use the new Selector system. This has a *huge* performance regression currently, which I'm
going to have to fix.