MONDRIAN-1769 - Changes so that mongolap will compile.