moved the argument evaluation back into the evaluator element; 'evaluateBranch' is no more
a little cleanup