Remove unnecessary boxing/unboxing