Fix regex, apply more wombats.

:ghost: