cli: Safer synonyms handling.