Merge "Differentiate the MNTTYPE_* and MNTOPT_* constants."