Remove typehack
Make bootstrap compile work for this branch.