Lots of regex fixes.