Merge "Fix CompilationUnit constructor issues."