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