Remove explicit boxing