Nit, but you also have to remove unsafeCoerce, some pointer stuff, and possibly a few other things.