(Flash) detect singular constraint type parameters in fix_overrides and handle them (closes #2712)