Centralize argv slicing

Change-Id: I2e06d4b2f33fa24da2f61a28bb01509515614336