Change certain cmds to single input, set type for watch-address, update tests.