Keep using the 3 evaluations dF_branch method for the Displacement output. The optimized 2 evaluations method used by node_bump is now on its own macro (dF_branch_incomplete). displacement_bump modifies the normal that nodetree_exec uses, so even with a refactor it wouldn’t be possible to re-use the computation anyway.