Regexp union refactor code, and remove v2 tags