Tweaked regex some more.