Improve addop and removeop commands.