s3:include: remove unused cli_state->called and cli_state->calling