Consolidate mask/mtx formats