roll back part of previous pass patch that was ill-advised and also adapt pass debug output a bit to be better for cost model training data
roll back part of previous pass patch that was ill-advised and also adapt pass debug output a bit to be better for cost model training data

regehr/souper,google/souper,jubitaneja/souper,regehr/souper,jubitaneja/souper,jubitaneja/souper,jubitaneja/souper,regehr/souper,google/souper,rsas/souper,jubitaneja/souper,rsas/souper,rsas/souper,google/souper,google/souper,rsas/souper,regehr/souper,regehr/souper,google/souper,jubitaneja/souper,rsas/souper,rsas/souper