simplify context cases in corresp_step