Selector matching: tweak variable naming, add comments.