WINDUP-118: First attempt at cleaning up the JavaClassModel relationships, plus some other cleanup