Long over due simplification of regexes.

Collapsed many of them to be much cleaner and
easier to read. Also remove some unnessicary junk.