Removed the comparator stuff from the FunctionCalls