return int instead long when possible (#17531)
2 files changed