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