2013-09-06-13.18.35: More typ/type -> type/typoid conversion work.