Rewritten handling of generic integer arguments

Change-Id: Ic45856cc7ec894da67d97f75a38638b0806e5db4
Merge "Rewritten handling of generic integer arguments"