performance improvements

Make alternate 'drop' vesions of some of the rules so that the Regexp
combiner (which requires identical actions when combining) can improve
performance. This appears to have a 2x performance enhancement in my
tests
replace performance test