Alignment fixes for recent changes to XML hashes. (nw)