2013-09-08-20.56.59: More typ/type -> type/typoid conversion work.