Added a macro for creating regular expressions and changed all regexes to use it