Regex tweaks, the matcher now fails a match slightly faster