Small cleanup using typedef.