Refactor tags for greater support.