remove duplicate code in assignment
fix in expr in bare context