simplify operation argument handling

Change-Id: Iec03c0257b9fe472f911bde93a4ea0cd00be3e70
Merge "simplify operation argument handling"