Taps: cleanup regexps around Taps

I pulled Regexps around Taps together.
Thanks in advance.