[selectors] Tweak at-risk and abstract.

--HG--
extra : rebase_source : dee14d4169c68a5c66ea87dd8ff15b1a61b4c6f7