Clean up note_selector a bit and stop handling combinators in two pla…
b4a2e2f
…ces. MozReview-Commit-ID: HhVi72K4yp0
