branch2: remove some extraneous evals and converts.