more cleanup and stuff with target definitions, including a rewrite of t_context to distinguish value vs term contexts
fix conflict