Fix model bug in --mbqi=fmc.  Minor cleanup in datatypes.