Our multi-file output support is janky. Perhaps we could simplify the Java case by nesting our types in an outer class?