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