Combine regexes

Also remove one that was less than 30 characters, and a workaround that
is no longer necessary.