Optimize fixCasesByJavaType for packages