Remove constraint that RHS is a FunctionExpression