Add nominal type information (as-yet unused), regularize matching-format version numbers