2013-09-05-13.40.07: More typ/type -> type/typoid conversion work.