Shuffle a few more functions.
Pull out typeinfo.c from simp.c