Add BindNew.
Move injectFunc->ResolveFunc.

Move TypeResolver stuff to its own file.