avoid dependency on Int implementation
2 files changed