Refactor how arguments are tracked. am: 62cc79bdf0
am: 60045299e7

Change-Id: I16820d5c995d96712dd8a259927f3e07a3a9f14f