Refactor 'client restart'. Add 'ninja restart' command.