redid and & or nodes to be short circuited