fixed some java 1.5-style autoboxing shenanigans.