Refactor actual argument lists

Related to #13009.

Change-Id: Ieaa9ec97c9e3a44056f094a30e47dbbea2e5566b