simplify q_out_bs step
more simplification to Evaluator
remove some more cruft from evaluator