avoid unnecessary boxing (#1102)

4 files changed