Rename @cli_command

Also fixes various bugs I had let creep in.