Note that this change also gets us quite a bit closer to replacing the special-purpose VersionJavaType stuff with the more generic ValueGeneration machinery.