Taps: cleanup regexps around Taps