Removing autoboxing from lots of other code too to even the playing field