There's no good reason to use types like long or short in new code.

Change-Id: Ic6de6259d5a99b7af478e9c6ab74e65d81b022e2