Combo test - clear issue

The combo code is a bit buggy.  [might only affect multi-level combos,
but I don't know]  Also, it does some iteration, and I wonder if this
gets short-circuited in some cases.  Is the end result correct?

Cheers
Jeremy