Added FunctionExpressionInvocation to the constraint generator
Fixed a bug in the annotator that made tests fail