Disambiguate should be smarter
Issue #601
new
If there is only one possibility to return some function, it should return this function. Even if some of the arguments are NULL.