Taps: cleanup regexps around Taps

Closes #29139.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>