Small changes in CompilationUnit.
Now all Java processing stuff is in one place.