Without this we have a choice between dropping lots of counter events
for counters > 0, or getting dazed and confused.  This brings it inline
with the 2.4 module code.  Tested on my 2-way.

Also fix a typo from Steven Cole, and remove some unnecessary code