fix shadowed vars not being recognized by mut-conv