Remove unnecessary boxing