2013-09-07-12.27.26: More typ/type -> type/typoid conversion work.