Java6 u31 compilation issues with GeoDistanceTests (was working the other day)

Attempting to compile with Java 6 u31 results in the following error:
type parameters of <V>V cannot be determined; no unique maximal instance exists for type variable V with upper bounds double,java.lang.Object

in GeoDistanceTests#distanceScriptTests on lines 275, 279, 283, 287, 291, and 294

Changing double to Double fixes this.