Remove typedefs and consolidate local variable initialization.
Signed-off-by: NDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: NNick Desaulniers <ndesaulniers@google.com>