Regex cleanups

[ci skip]