Rename and fix if/conditional in ExpressionBuilder 

This is a minor change that renames and fixes a previously badly named and _broken_ feature of ```ExpressionBuilder```. Closes #4470.