A bit of spaghetti effect -- need to support a different arity of a call .
Authored by: tswift 2019-11-05
Parent: [r9709]
Child: [r9711]
