Change effect selector names, and introduce combinators