don't refer to self in TypeUtils.
Fix a typo in a rename, and statically import the new TypeUtils' static methods.