Refactor how arguments are tracked.
am: 62cc79bdf0

Change-Id: I162f88e591ea664d1b9c0c5610b221f6c4c47268