Remove trivial typedef, to make code more obvious

Change-Id: I70017a5c6f9403520ee79e9d0864352eb1c8e100