I went for the approach of two separate regexes because I think it's a little more readable, and a little easier to maintain (dropping support for legacy tokens is as simple as deleting the old regex, and its use in the if statement)