The xptcall code needs to be fixed for this to build and work. This for now adds some preliminary changes to allow the rest of it to build.