Clean up regular expression code with or-patterns

[peblair]

The match expressions in regex.gr contain a variety of duplicated branches which differ only by the variant being matched. We should clean these up using or-patterns.

[ospencer]

Unblocked by #1173!