Expand list of excluded tags

and move back to non-class form.