Making add/rm work with clikit.