Fix a few hacky parser rules for selectors