Unify recursion constraints between invoke and call

Unify recursion constraints between invoke and call #931