very minor update based on JavaType/generics types updates