Remove some more useless boxing