To me it's much more maintainable to build the regexes from lists, rather than going right to the regex. Why did you change this?