Separate intrinsics verify/resolution and make TypeMapper static