Improve debuggability of freebase provider code