Minor type name cleanups.