Minor changes for different `mptypes.h' format.