some clean-up for Cond eval