@amirsh The changes I made here (and in other places) may be incompatible with macro based type-providers and have to be changed in this case.