juju_cmd: Update for 1.18, clean up