Tried another kludge for the Xmd.h problem.