Fixed usage of functions as comparators

- Fixed the parameter order of evalCondition
- Fixed the "control" parameter at the call to evalCondition (this.control does not exist.)