Rearrange grammar/actions to remove the 'tag' method.
It was error prone and a bit confusing. Also renamed 'scoped' to the more appropriate 'list'.