Tweaks to the regex of doom