More work for the XMLA branch.