Allow additional selector combinators, such as +~*
Whitespace cleanup