Added support for not do a lot of autoboxing.