Cleaned up a whole bunch of regex, combined cases where appropriate.

(Don't worry, I have a whole ton of tests that still pass)