Minor changes to eval_D methods