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