Prd 5041 - Regression in expression/function eval order, 5.0 branch fix.