Witness searcher optimized a bit.
Additional optimization of witness searcher.
Transition markings definitely removed.