Lots more cleanups of typedefs/using