Fixed usage of functions as comparators

- Fixed passing parameters to evalCondition
- Fixed the control parameter of the call to evalCondition (this.control did not exist).