More typedef cleanup