I think we need to work on these messages for better clarity. Maybe, "Wrap the function expression in parens"?

I think the original message is the best for the other condition.