Adding "no-ambiguity" option and reenabling "stringent-chimera"