Remove Range.UNKNOWN and fix a lot of small bugs

102 files changed, 239 insertions, 249 deletions

diff --git a/javaparser-core/src/main/java/com/github/javaparser/Range.java b/javaparser-core/src/main/java/com/github/javaparser/Range.java
index 68e364aed..f0021690b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/Range.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/Range.java
@@ -6,8 +6,6 @@ import static com.github.javaparser.Position.pos;
  * A range of characters in a source file, from "begin" to "end", including the characters at "begin" and "end".
  */
 public class Range {
-    public static final Range UNKNOWN = range(Position.UNKNOWN, Position.UNKNOWN);
-
     public final Position begin;
     public final Position end;
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/ArrayBracketPair.java b/javaparser-core/src/main/java/com/github/javaparser/ast/ArrayBracketPair.java
index ca3f93457..eda0ec9f1 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/ArrayBracketPair.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/ArrayBracketPair.java
@@ -16,11 +16,11 @@ public class ArrayBracketPair extends Node implements NodeWithAnnotations<ArrayB
     private NodeList<AnnotationExpr> annotations = new NodeList<>();
 
     public ArrayBracketPair() {
-        this(Range.UNKNOWN, new NodeList<AnnotationExpr>());
+        this(null, new NodeList<>());
     }
 
     public ArrayBracketPair(NodeList<AnnotationExpr> annotations) {
-        this(Range.UNKNOWN, annotations);
+        this(null, annotations);
     }
 
     public ArrayBracketPair(Range range, NodeList<AnnotationExpr> annotations) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/ArrayCreationLevel.java b/javaparser-core/src/main/java/com/github/javaparser/ast/ArrayCreationLevel.java
index 62fd9f4e1..267c002d4 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/ArrayCreationLevel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/ArrayCreationLevel.java
@@ -22,19 +22,19 @@ public class ArrayCreationLevel extends Node implements NodeWithAnnotations<Arra
     private NodeList<AnnotationExpr> annotations = new NodeList<>();
 
     public ArrayCreationLevel() {
-        this(Range.UNKNOWN, null, new NodeList<>());
+        this(null, null, new NodeList<>());
     }
 
     public ArrayCreationLevel(int dimension) {
-        this(Range.UNKNOWN, new IntegerLiteralExpr("" + dimension), new NodeList<>());
+        this(null, new IntegerLiteralExpr("" + dimension), new NodeList<>());
     }
 
     public ArrayCreationLevel(Expression dimension) {
-        this(Range.UNKNOWN, dimension, new NodeList<>());
+        this(null, dimension, new NodeList<>());
     }
 
     public ArrayCreationLevel(Expression dimension, NodeList<AnnotationExpr> annotations) {
-        this(Range.UNKNOWN, dimension, annotations);
+        this(null, dimension, annotations);
     }
 
     public ArrayCreationLevel(Range range, Expression dimension, NodeList<AnnotationExpr> annotations) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/CompilationUnit.java b/javaparser-core/src/main/java/com/github/javaparser/ast/CompilationUnit.java
index fe1ab3529..39243625d 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/CompilationUnit.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/CompilationUnit.java
@@ -69,11 +69,11 @@ public final class CompilationUnit extends Node {
     private NodeList<TypeDeclaration<?>> types;
 
     public CompilationUnit() {
-        this(Range.UNKNOWN, null, new NodeList<>(), new NodeList<>());
+        this(null, null, new NodeList<>(), new NodeList<>());
     }
 
     public CompilationUnit(PackageDeclaration pakage, NodeList<ImportDeclaration> imports, NodeList<TypeDeclaration<?>> types) {
-        this(Range.UNKNOWN, pakage, imports, types);
+        this(null, pakage, imports, types);
     }
 
     public CompilationUnit(Range range, PackageDeclaration pakage, NodeList<ImportDeclaration> imports,
@@ -98,10 +98,9 @@ public final class CompilationUnit extends Node {
      * Return a list containing all comments declared in this compilation unit.
      * Including javadocs, line comments and block comments of all types,
      * inner-classes and other members.<br>
-     * If there is no comment, <code>null</code> is returned.
+     * If there is no comment, an empty list is returned.
      * 
-     * @return list with all comments of this compilation unit or
-     *         <code>null</code>
+     * @return list with all comments of this compilation unit.
      * @see JavadocComment
      * @see com.github.javaparser.ast.comments.LineComment
      * @see com.github.javaparser.ast.comments.BlockComment
@@ -146,16 +145,6 @@ public final class CompilationUnit extends Node {
     }
 
     /**
-     * Sets the list of comments of this compilation unit.
-     * 
-     * @param comments
-     *            the list of comments
-     */
-    public CompilationUnit setComments(List<Comment> comments) {
-        throw new RuntimeException("Not implemented!");
-    }
-
-    /**
      * Sets the list of imports of this compilation unit. The list is initially
      * <code>null</code>.
      * 
@@ -241,7 +230,7 @@ public final class CompilationUnit extends Node {
      * @return this, the {@link CompilationUnit}
      */
     public CompilationUnit addImport(String name, boolean isStatic, boolean isAsterisk) {
-        final ImportDeclaration importDeclaration = ImportDeclaration.create(Range.UNKNOWN, Name.parse(name), isStatic, isAsterisk);
+        final ImportDeclaration importDeclaration = ImportDeclaration.create(null, Name.parse(name), isStatic, isAsterisk);
         if (getImports().stream().anyMatch(i -> i.toString().equals(importDeclaration.toString())))
             return this;
         else {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/PackageDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/PackageDeclaration.java
index 4729ee5e6..7ed436009 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/PackageDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/PackageDeclaration.java
@@ -54,15 +54,15 @@ public final class PackageDeclaration extends Node implements
     private Name name;
 
     public PackageDeclaration() {
-        this(Range.UNKNOWN, new NodeList<>(), new Name());
+        this(null, new NodeList<>(), new Name());
     }
 
     public PackageDeclaration(Name name) {
-        this(Range.UNKNOWN, new NodeList<>(), name);
+        this(null, new NodeList<>(), name);
     }
 
     public PackageDeclaration(NodeList<AnnotationExpr> annotations, Name name) {
-        this(Range.UNKNOWN, annotations, name);
+        this(null, annotations, name);
     }
 
     public PackageDeclaration(Range range, NodeList<AnnotationExpr> annotations, Name name) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationDeclaration.java
index 7585e6d8f..facef483f 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationDeclaration.java
@@ -43,7 +43,7 @@ import static com.github.javaparser.ast.expr.NameExpr.*;
 public final class AnnotationDeclaration extends TypeDeclaration<AnnotationDeclaration> {
 
     public AnnotationDeclaration() {
-        this(Range.UNKNOWN,
+        this(null,
                 EnumSet.noneOf(Modifier.class),
                 new NodeList<>(),
                 new SimpleName(),
@@ -51,7 +51,7 @@ public final class AnnotationDeclaration extends TypeDeclaration<AnnotationDecla
     }
 
     public AnnotationDeclaration(EnumSet<Modifier> modifiers, String name) {
-        this(Range.UNKNOWN,
+        this(null,
                 modifiers,
                 new NodeList<>(),
                 new SimpleName(name),
@@ -60,7 +60,7 @@ public final class AnnotationDeclaration extends TypeDeclaration<AnnotationDecla
 
     public AnnotationDeclaration(EnumSet<Modifier> modifiers, NodeList<AnnotationExpr> annotations, SimpleName name,
                                  NodeList<BodyDeclaration<?>> members) {
-        this(Range.UNKNOWN,
+        this(null,
                 modifiers,
                 annotations,
                 name,
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java
index 3b0bf2685..feef71640 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java
@@ -60,7 +60,7 @@ public final class AnnotationMemberDeclaration extends BodyDeclaration<Annotatio
     private Expression defaultValue;
 
     public AnnotationMemberDeclaration() {
-        this(Range.UNKNOWN,
+        this(null,
                 EnumSet.noneOf(Modifier.class),
                 new NodeList<>(),
                 new ClassOrInterfaceType(),
@@ -69,7 +69,7 @@ public final class AnnotationMemberDeclaration extends BodyDeclaration<Annotatio
     }
 
     public AnnotationMemberDeclaration(EnumSet<Modifier> modifiers, Type<?> type, String name, Expression defaultValue) {
-        this(Range.UNKNOWN,
+        this(null,
                 modifiers,
                 new NodeList<>(),
                 type,
@@ -79,7 +79,7 @@ public final class AnnotationMemberDeclaration extends BodyDeclaration<Annotatio
 
     public AnnotationMemberDeclaration(EnumSet<Modifier> modifiers, NodeList<AnnotationExpr> annotations, Type<?> type, SimpleName name,
                                        Expression defaultValue) {
-        this(Range.UNKNOWN,
+        this(null,
                 modifiers,
                 annotations,
                 type,
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/BodyDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/BodyDeclaration.java
index 690cae593..46166ccc4 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/BodyDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/BodyDeclaration.java
@@ -37,11 +37,11 @@ public abstract class BodyDeclaration<T extends Node> extends Node implements No
     private NodeList<AnnotationExpr> annotations;
 
     public BodyDeclaration() {
-        this(Range.UNKNOWN, new NodeList<>());
+        this(null, new NodeList<>());
     }
 
     public BodyDeclaration(NodeList<AnnotationExpr> annotations) {
-        this(Range.UNKNOWN, annotations);
+        this(null, annotations);
     }
 
     public BodyDeclaration(Range range, NodeList<AnnotationExpr> annotations) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java
index 339cc6e4a..5fa7ca6c4 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java
@@ -58,7 +58,7 @@ public final class ClassOrInterfaceDeclaration extends TypeDeclaration<ClassOrIn
     private NodeList<ClassOrInterfaceType> implementsList;
 
     public ClassOrInterfaceDeclaration() {
-        this(Range.UNKNOWN, 
+        this(null, 
                 EnumSet.noneOf(Modifier.class), 
                 new NodeList<>(), 
                 false, 
@@ -71,7 +71,7 @@ public final class ClassOrInterfaceDeclaration extends TypeDeclaration<ClassOrIn
 
     public ClassOrInterfaceDeclaration(final EnumSet<Modifier> modifiers, final boolean isInterface,
                                        final String name) {
-        this(Range.UNKNOWN, 
+        this(null, 
                 modifiers, 
                 new NodeList<>(), 
                 isInterface,
@@ -89,7 +89,7 @@ public final class ClassOrInterfaceDeclaration extends TypeDeclaration<ClassOrIn
                                        final NodeList<ClassOrInterfaceType> extendsList,
                                        final NodeList<ClassOrInterfaceType> implementsList,
                                        final NodeList<BodyDeclaration<?>> members) {
-        this(Range.UNKNOWN, modifiers, annotations, isInterface, name, typeParameters, extendsList, implementsList, members);
+        this(null, modifiers, annotations, isInterface, name, typeParameters, extendsList, implementsList, members);
     }
 
     public ClassOrInterfaceDeclaration(Range range, final EnumSet<Modifier> modifiers,
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java
index aee8365b4..5fde458f5 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java
@@ -65,7 +65,7 @@ public final class ConstructorDeclaration extends BodyDeclaration<ConstructorDec
     private BlockStmt body;
 
     public ConstructorDeclaration() {
-        this(Range.UNKNOWN,
+        this(null,
                 EnumSet.noneOf(Modifier.class),
                 new NodeList<>(),
                 new NodeList<>(),
@@ -76,7 +76,7 @@ public final class ConstructorDeclaration extends BodyDeclaration<ConstructorDec
     }
 
     public ConstructorDeclaration(EnumSet<Modifier> modifiers, String name) {
-        this(Range.UNKNOWN,
+        this(null,
                 modifiers,
                 new NodeList<>(),
                 new NodeList<>(),
@@ -90,7 +90,7 @@ public final class ConstructorDeclaration extends BodyDeclaration<ConstructorDec
                                   NodeList<TypeParameter> typeParameters,
                                   SimpleName name, NodeList<Parameter> parameters, NodeList<ReferenceType<?>> throws_,
                                   BlockStmt block) {
-        this(Range.UNKNOWN,
+        this(null,
                 modifiers,
                 annotations,
                 typeParameters,
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/EmptyMemberDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/EmptyMemberDeclaration.java
index 1e4a9877f..63b8a40d3 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/EmptyMemberDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/EmptyMemberDeclaration.java
@@ -35,7 +35,7 @@ public final class EmptyMemberDeclaration extends BodyDeclaration<EmptyMemberDec
         implements NodeWithJavaDoc<EmptyMemberDeclaration> {
 
     public EmptyMemberDeclaration() {
-        this(Range.UNKNOWN);
+        this(null);
     }
 
     public EmptyMemberDeclaration(Range range) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/EmptyTypeDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/EmptyTypeDeclaration.java
index 66a24a5b4..f5c411d9f 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/EmptyTypeDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/EmptyTypeDeclaration.java
@@ -39,7 +39,7 @@ import static com.github.javaparser.ast.NodeList.*;
 public final class EmptyTypeDeclaration extends TypeDeclaration<EmptyTypeDeclaration> {
 
     public EmptyTypeDeclaration() {
-        this(Range.UNKNOWN);
+        this(null);
     }
 
     public EmptyTypeDeclaration(Range range) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java
index a3d517fea..046711446 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java
@@ -50,7 +50,7 @@ public final class EnumConstantDeclaration extends BodyDeclaration<EnumConstantD
     private NodeList<BodyDeclaration<?>> classBody;
 
     public EnumConstantDeclaration() {
-        this(Range.UNKNOWN, 
+        this(null, 
                 new NodeList<>(), 
                 new SimpleName(),
                 new NodeList<>(),
@@ -58,7 +58,7 @@ public final class EnumConstantDeclaration extends BodyDeclaration<EnumConstantD
     }
 
     public EnumConstantDeclaration(String name) {
-        this(Range.UNKNOWN, 
+        this(null, 
                 new NodeList<>(),
                 new SimpleName(name),
                 new NodeList<>(),
@@ -67,7 +67,7 @@ public final class EnumConstantDeclaration extends BodyDeclaration<EnumConstantD
 
     public EnumConstantDeclaration(NodeList<AnnotationExpr> annotations, SimpleName name, NodeList<Expression> args,
                                    NodeList<BodyDeclaration<?>> classBody) {
-        this(Range.UNKNOWN, annotations, name, args, classBody);
+        this(null, annotations, name, args, classBody);
     }
 
     public EnumConstantDeclaration(Range range, NodeList<AnnotationExpr> annotations, SimpleName name, NodeList<Expression> args,
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumDeclaration.java
index 7898d16a8..bc25e4a1d 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumDeclaration.java
@@ -48,7 +48,7 @@ public final class EnumDeclaration extends TypeDeclaration<EnumDeclaration> impl
     private NodeList<EnumConstantDeclaration> entries;
 
     public EnumDeclaration() {
-        this(Range.UNKNOWN, 
+        this(null, 
                 EnumSet.noneOf(Modifier.class), 
                 new NodeList<>(), 
                 new SimpleName(), 
@@ -58,7 +58,7 @@ public final class EnumDeclaration extends TypeDeclaration<EnumDeclaration> impl
     }
 
     public EnumDeclaration(EnumSet<Modifier> modifiers, String name) {
-        this(Range.UNKNOWN,
+        this(null,
                 modifiers,
                 new NodeList<>(),
                 new SimpleName(name),
@@ -70,7 +70,7 @@ public final class EnumDeclaration extends TypeDeclaration<EnumDeclaration> impl
     public EnumDeclaration(EnumSet<Modifier> modifiers, NodeList<AnnotationExpr> annotations, SimpleName name,
                            NodeList<ClassOrInterfaceType> implementsList, NodeList<EnumConstantDeclaration> entries,
                            NodeList<BodyDeclaration<?>> members) {
-        this(Range.UNKNOWN,
+        this(null,
                 modifiers,
                 annotations,
                 name,
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java
index 31dd5eabf..dccd4513b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java
@@ -66,7 +66,7 @@ public final class FieldDeclaration extends BodyDeclaration<FieldDeclaration> im
     private NodeList<ArrayBracketPair> arrayBracketPairsAfterElementType;
 
     public FieldDeclaration() {
-        this(Range.UNKNOWN,
+        this(null,
                 EnumSet.noneOf(Modifier.class),
                 new NodeList<>(),
                 new ClassOrInterfaceType(),
@@ -75,7 +75,7 @@ public final class FieldDeclaration extends BodyDeclaration<FieldDeclaration> im
     }
 
     public FieldDeclaration(EnumSet<Modifier> modifiers, Type<?> elementType, VariableDeclarator variable) {
-        this(Range.UNKNOWN,
+        this(null,
                 modifiers,
                 new NodeList<>(),
                 elementType,
@@ -84,7 +84,7 @@ public final class FieldDeclaration extends BodyDeclaration<FieldDeclaration> im
     }
 
     public FieldDeclaration(EnumSet<Modifier> modifiers, Type<?> elementType, NodeList<VariableDeclarator> variables) {
-        this(Range.UNKNOWN,
+        this(null,
                 modifiers,
                 new NodeList<>(),
                 elementType,
@@ -94,7 +94,7 @@ public final class FieldDeclaration extends BodyDeclaration<FieldDeclaration> im
 
     public FieldDeclaration(EnumSet<Modifier> modifiers, NodeList<AnnotationExpr> annotations, Type<?> elementType, NodeList<ArrayBracketPair> arrayBracketPairsAfterElementType,
                             NodeList<VariableDeclarator> variables) {
-        this(Range.UNKNOWN,
+        this(null,
                 modifiers,
                 annotations,
                 elementType,
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/InitializerDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/InitializerDeclaration.java
index 200470a67..7f33cf42b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/InitializerDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/InitializerDeclaration.java
@@ -42,11 +42,11 @@ public final class InitializerDeclaration extends BodyDeclaration<InitializerDec
     private BlockStmt block;
 
     public InitializerDeclaration() {
-        this(Range.UNKNOWN, false, new BlockStmt());
+        this(null, false, new BlockStmt());
     }
 
     public InitializerDeclaration(boolean isStatic, BlockStmt block) {
-        this(Range.UNKNOWN, isStatic, block);
+        this(null, isStatic, block);
     }
 
     public InitializerDeclaration(Range range, boolean isStatic, BlockStmt block) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java
index 29cc9c950..9d05a508b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java
@@ -91,7 +91,7 @@ public final class MethodDeclaration extends BodyDeclaration<MethodDeclaration>
     private NodeList<ArrayBracketPair> arrayBracketPairsAfterParameterList;
 
     public MethodDeclaration() {
-        this(Range.UNKNOWN,
+        this(null,
                 EnumSet.noneOf(Modifier.class),
                 new NodeList<>(),
                 new NodeList<>(),
@@ -106,7 +106,7 @@ public final class MethodDeclaration extends BodyDeclaration<MethodDeclaration>
     }
 
     public MethodDeclaration(final EnumSet<Modifier> modifiers, final Type<?> elementType, final String name) {
-        this(Range.UNKNOWN,
+        this(null,
                 modifiers,
                 new NodeList<>(),
                 new NodeList<>(),
@@ -122,7 +122,7 @@ public final class MethodDeclaration extends BodyDeclaration<MethodDeclaration>
 
     public MethodDeclaration(final EnumSet<Modifier> modifiers, final Type<?> elementType, final String name,
                              final NodeList<Parameter> parameters) {
-        this(Range.UNKNOWN,
+        this(null,
                 modifiers,
                 new NodeList<>(),
                 new NodeList<>(),
@@ -147,7 +147,7 @@ public final class MethodDeclaration extends BodyDeclaration<MethodDeclaration>
                              final NodeList<ArrayBracketPair> arrayBracketPairsAfterParameterList,
                              final NodeList<ReferenceType<?>> throws_, 
                              final BlockStmt body) {
-        this(Range.UNKNOWN,
+        this(null,
                 modifiers,
                 annotations,
                 typeParameters,
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/Parameter.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/Parameter.java
index 27a42bf4b..ca2d1e158 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/Parameter.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/Parameter.java
@@ -68,7 +68,7 @@ public final class Parameter extends Node implements
     private NodeList<ArrayBracketPair> arrayBracketPairsAfterType;
 
     public Parameter() {
-        this(Range.UNKNOWN,
+        this(null,
                 EnumSet.noneOf(Modifier.class),
                 new NodeList<>(),
                 new ClassOrInterfaceType(),
@@ -78,7 +78,7 @@ public final class Parameter extends Node implements
     }
 
     public Parameter(Type<?> elementType, VariableDeclaratorId id) {
-        this(Range.UNKNOWN,
+        this(null,
                 EnumSet.noneOf(Modifier.class),
                 new NodeList<>(),
                 elementType,
@@ -96,7 +96,7 @@ public final class Parameter extends Node implements
      *            name of the parameter
      */
     public Parameter(Type<?> elementType, String name) {
-        this(Range.UNKNOWN,
+        this(null,
                 EnumSet.noneOf(Modifier.class),
                 new NodeList<>(),
                 elementType,
@@ -106,7 +106,7 @@ public final class Parameter extends Node implements
     }
 
     public Parameter(EnumSet<Modifier> modifiers, Type<?> elementType, VariableDeclaratorId id) {
-        this(Range.UNKNOWN,
+        this(null,
                 modifiers,
                 new NodeList<>(),
                 elementType,
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java
index aa0d6a489..ffd67647f 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java
@@ -54,7 +54,7 @@ public abstract class TypeDeclaration<T extends Node> extends BodyDeclaration<T>
     private NodeList<BodyDeclaration<?>> members;
 
 	public TypeDeclaration() {
-		this(Range.UNKNOWN,
+		this(null,
                 new NodeList<>(),
                 EnumSet.noneOf(Modifier.class),
                 new SimpleName(),
@@ -62,7 +62,7 @@ public abstract class TypeDeclaration<T extends Node> extends BodyDeclaration<T>
 	}
 
     public TypeDeclaration(EnumSet<Modifier> modifiers, String name) {
-        this(Range.UNKNOWN,
+        this(null,
                 new NodeList<>(),
                 modifiers,
                 new SimpleName(name),
@@ -72,7 +72,7 @@ public abstract class TypeDeclaration<T extends Node> extends BodyDeclaration<T>
 	public TypeDeclaration(NodeList<AnnotationExpr> annotations,
                            EnumSet<Modifier> modifiers, SimpleName name,
                            NodeList<BodyDeclaration<?>> members) {
-        this(Range.UNKNOWN,
+        this(null,
                 annotations,
                 modifiers,
                 name,
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java
index 16eb1fdeb..54886ea5b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java
@@ -51,15 +51,15 @@ public final class VariableDeclarator extends Node implements
     private Expression init;
 
     public VariableDeclarator() {
-        this(Range.UNKNOWN, new VariableDeclaratorId(), null);
+        this(null, new VariableDeclaratorId(), null);
     }
 
     public VariableDeclarator(VariableDeclaratorId id) {
-        this(Range.UNKNOWN, id, null);
+        this(null, id, null);
     }
 
     public VariableDeclarator(String variableName) {
-        this(Range.UNKNOWN, new VariableDeclaratorId(variableName), null);
+        this(null, new VariableDeclaratorId(variableName), null);
     }
 
     /**
@@ -71,11 +71,11 @@ public final class VariableDeclarator extends Node implements
      *            already added.
      */
     public VariableDeclarator(VariableDeclaratorId id, Expression init) {
-        this(Range.UNKNOWN, id, init);
+        this(null, id, init);
     }
 
     public VariableDeclarator(String variableName, Expression init) {
-        this(Range.UNKNOWN, new VariableDeclaratorId(variableName), init);
+        this(null, new VariableDeclaratorId(variableName), init);
     }
 
     public VariableDeclarator(Range range, VariableDeclaratorId id, Expression init) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/VariableDeclaratorId.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/VariableDeclaratorId.java
index fe1067828..0b4a54db0 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/VariableDeclaratorId.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/VariableDeclaratorId.java
@@ -42,19 +42,19 @@ public final class VariableDeclaratorId extends Node implements NodeWithSimpleNa
     private NodeList<ArrayBracketPair> arrayBracketPairsAfterId;
 
     public VariableDeclaratorId() {
-        this(Range.UNKNOWN,
+        this(null,
                 new SimpleName(),
                 new NodeList<>());
     }
 
     public VariableDeclaratorId(String name) {
-        this(Range.UNKNOWN,
+        this(null,
                 new SimpleName(name),
                 new NodeList<>());
     }
 
     public VariableDeclaratorId(SimpleName name) {
-        this(Range.UNKNOWN,
+        this(null,
                 name,
                 new NodeList<>());
     }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/BlockComment.java b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/BlockComment.java
index 210de95c9..3ea258450 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/BlockComment.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/BlockComment.java
@@ -37,11 +37,11 @@ import com.github.javaparser.ast.visitor.VoidVisitor;
 public final class BlockComment extends Comment {
 
     public BlockComment() {
-        this(Range.UNKNOWN, "empty");
+        this(null, "empty");
     }
 
     public BlockComment(String content) {
-        this(Range.UNKNOWN, content);
+        this(null, content);
     }
 
     public BlockComment(Range range, String content) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/JavadocComment.java b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/JavadocComment.java
index 709fabde5..490ba2d46 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/JavadocComment.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/JavadocComment.java
@@ -31,11 +31,11 @@ import com.github.javaparser.ast.visitor.VoidVisitor;
 public final class JavadocComment extends Comment {
 
     public JavadocComment() {
-        this(Range.UNKNOWN, "empty");
+        this(null, "empty");
     }
 
     public JavadocComment(String content) {
-        this(Range.UNKNOWN, content);
+        this(null, content);
     }
 
     public JavadocComment(Range range, String content) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/LineComment.java b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/LineComment.java
index 6c48d6ebd..97b30eace 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/LineComment.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/LineComment.java
@@ -36,11 +36,11 @@ import com.github.javaparser.ast.visitor.VoidVisitor;
 public final class LineComment extends Comment {
 
     public LineComment() {
-        this(Range.UNKNOWN, "empty");
+        this(null, "empty");
     }
 
     public LineComment(String content) {
-        this(Range.UNKNOWN, content);
+        this(null, content);
     }
 
     public LineComment(Range range, String content) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AnnotationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AnnotationExpr.java
index 0ac677bcf..775490fd7 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AnnotationExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AnnotationExpr.java
@@ -34,11 +34,11 @@ public abstract class AnnotationExpr extends Expression implements NodeWithName<
     protected Name name;
 
     public AnnotationExpr() {
-        this(Range.UNKNOWN, new Name());
+        this(null, new Name());
     }
 
     public AnnotationExpr(Name name) {
-        this(Range.UNKNOWN, name);
+        this(null, name);
     }
     
     public AnnotationExpr(Range range, Name name) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayAccessExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayAccessExpr.java
index ba75050c2..fb63fb62a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayAccessExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayAccessExpr.java
@@ -37,11 +37,11 @@ public final class ArrayAccessExpr extends Expression {
     private Expression index;
 
     public ArrayAccessExpr() {
-        this(Range.UNKNOWN, new NameExpr(), new IntegerLiteralExpr());
+        this(null, new NameExpr(), new IntegerLiteralExpr());
     }
 
     public ArrayAccessExpr(Expression name, Expression index) {
-        this(Range.UNKNOWN, name, index);
+        this(null, name, index);
     }
 
     public ArrayAccessExpr(Range range, Expression name, Expression index) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayCreationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayCreationExpr.java
index 2c0574734..d1b5a5e7c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayCreationExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayCreationExpr.java
@@ -51,21 +51,21 @@ public final class ArrayCreationExpr extends Expression {
     private ArrayInitializerExpr initializer;
 
     public ArrayCreationExpr() {
-        this(Range.UNKNOWN,
+        this(null,
                 new ClassOrInterfaceType(),
                 new NodeList<>(),
                 new ArrayInitializerExpr());
     }
 
     public ArrayCreationExpr(Type<?> elementType, NodeList<ArrayCreationLevel> levels, ArrayInitializerExpr initializer) {
-        this(Range.UNKNOWN,
+        this(null,
                 elementType,
                 levels,
                 initializer);
     }
 
     public ArrayCreationExpr(Type<?> elementType) {
-        this(Range.UNKNOWN,
+        this(null,
                 elementType,
                 new NodeList<>(),
                 new ArrayInitializerExpr());
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayInitializerExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayInitializerExpr.java
index 8782a0da1..6848ea6ca 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayInitializerExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayInitializerExpr.java
@@ -36,11 +36,11 @@ public final class ArrayInitializerExpr extends Expression {
     private NodeList<Expression> values;
 
     public ArrayInitializerExpr() {
-        this(Range.UNKNOWN, new NodeList<>());
+        this(null, new NodeList<>());
     }
 
     public ArrayInitializerExpr(NodeList<Expression> values) {
-       this(Range.UNKNOWN, values);
+       this(null, values);
     }
 
     public ArrayInitializerExpr(Range range, NodeList<Expression> values) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java
index e3832224d..f626e03f1 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java
@@ -52,11 +52,11 @@ public final class AssignExpr extends Expression {
     private Operator op;
 
     public AssignExpr() {
-        this(Range.UNKNOWN, new NameExpr(), new StringLiteralExpr(), Operator.assign);
+        this(null, new NameExpr(), new StringLiteralExpr(), Operator.assign);
     }
 
     public AssignExpr(Expression target, Expression value, Operator op) {
-        this(Range.UNKNOWN, target, value, op);
+        this(null, target, value, op);
     }
 
     public AssignExpr(Range range, Expression target, Expression value, Operator op) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BinaryExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BinaryExpr.java
index f0785f859..8d1e9682c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BinaryExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BinaryExpr.java
@@ -59,11 +59,11 @@ public final class BinaryExpr extends Expression {
     private Operator op;
 
     public BinaryExpr() {
-        this(Range.UNKNOWN, new BooleanLiteralExpr(), new BooleanLiteralExpr(), Operator.equals);
+        this(null, new BooleanLiteralExpr(), new BooleanLiteralExpr(), Operator.equals);
     }
 
     public BinaryExpr(Expression left, Expression right, Operator op) {
-        this(Range.UNKNOWN, left, right, op);
+        this(null, left, right, op);
     }
 
     public BinaryExpr(Range range, Expression left, Expression right, Operator op) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BooleanLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BooleanLiteralExpr.java
index f1c318842..fe9430445 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BooleanLiteralExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BooleanLiteralExpr.java
@@ -33,11 +33,11 @@ public final class BooleanLiteralExpr extends LiteralExpr {
     private boolean value;
 
     public BooleanLiteralExpr() {
-        this(Range.UNKNOWN, false);
+        this(null, false);
     }
 
     public BooleanLiteralExpr(boolean value) {
-    	this(Range.UNKNOWN, value);
+    	this(null, value);
     }
 
     public BooleanLiteralExpr(Range range, boolean value) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CastExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CastExpr.java
index 78fcbbe0f..85ab99e48 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CastExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CastExpr.java
@@ -40,11 +40,11 @@ public final class CastExpr extends Expression implements NodeWithType<CastExpr,
     private Expression expr;
 
     public CastExpr() {
-        this(Range.UNKNOWN, new ClassOrInterfaceType(), new NameExpr());
+        this(null, new ClassOrInterfaceType(), new NameExpr());
     }
 
     public CastExpr(Type<?> type, Expression expr) {
-        this(Range.UNKNOWN, type, expr);
+        this(null, type, expr);
     }
 
     public CastExpr(Range range, Type<?> type, Expression expr) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CharLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CharLiteralExpr.java
index 7304a6965..af2a9f4d0 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CharLiteralExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CharLiteralExpr.java
@@ -32,11 +32,11 @@ import com.github.javaparser.ast.visitor.VoidVisitor;
 public final class CharLiteralExpr extends StringLiteralExpr {
 
     public CharLiteralExpr() {
-        this(Range.UNKNOWN, "?");
+        this(null, "?");
     }
 
     public CharLiteralExpr(String value) {
-        this(Range.UNKNOWN, value);
+        this(null, value);
     }
 
     public CharLiteralExpr(Range range, String value) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java
index 576c2dedd..3977d1e86 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java
@@ -41,11 +41,11 @@ public final class ClassExpr extends Expression implements NodeWithType<ClassExp
     private Type type;
 
     public ClassExpr() {
-        this(Range.UNKNOWN, new ClassOrInterfaceType());
+        this(null, new ClassOrInterfaceType());
     }
 
     public ClassExpr(Type<?> type) {
-       this(Range.UNKNOWN, type);
+       this(null, type);
     }
 
     public ClassExpr(Range range, Type type) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ConditionalExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ConditionalExpr.java
index 2778d7536..e3afc9af1 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ConditionalExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ConditionalExpr.java
@@ -39,11 +39,11 @@ public final class ConditionalExpr extends Expression {
     private Expression elseExpr;
 
     public ConditionalExpr() {
-        this(Range.UNKNOWN, new BooleanLiteralExpr(), new StringLiteralExpr(), new StringLiteralExpr());
+        this(null, new BooleanLiteralExpr(), new StringLiteralExpr(), new StringLiteralExpr());
     }
 
     public ConditionalExpr(Expression condition, Expression thenExpr, Expression elseExpr) {
-        this(Range.UNKNOWN, condition, thenExpr, elseExpr);
+        this(null, condition, thenExpr, elseExpr);
     }
 
     public ConditionalExpr(Range range, Expression condition, Expression thenExpr, Expression elseExpr) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/DoubleLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/DoubleLiteralExpr.java
index dd34cac63..9949a9fb3 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/DoubleLiteralExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/DoubleLiteralExpr.java
@@ -31,11 +31,11 @@ import com.github.javaparser.ast.visitor.VoidVisitor;
 public final class DoubleLiteralExpr extends StringLiteralExpr {
 
 	public DoubleLiteralExpr() {
-        this(Range.UNKNOWN, "0");
+        this(null, "0");
 	}
 
 	public DoubleLiteralExpr(final String value) {
-		this(Range.UNKNOWN, value);
+		this(null, value);
 	}
 
 	public DoubleLiteralExpr(final Range range, final String value) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/EnclosedExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/EnclosedExpr.java
index e54cb8cd9..d1e8205d8 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/EnclosedExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/EnclosedExpr.java
@@ -35,11 +35,11 @@ public final class EnclosedExpr extends Expression {
 	private Expression inner;
 
 	public EnclosedExpr() {
-        this(Range.UNKNOWN, new StringLiteralExpr());
+        this(null, new StringLiteralExpr());
 	}
 
 	public EnclosedExpr(final Expression inner) {
-		this(Range.UNKNOWN, inner);
+		this(null, inner);
 	}
 
 	public EnclosedExpr(final Range range, final Expression inner) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java
index be3381b06..e011061d6 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java
@@ -44,11 +44,11 @@ public final class FieldAccessExpr extends Expression implements NodeWithTypeArg
     private SimpleName field;
 
     public FieldAccessExpr() {
-        this(Range.UNKNOWN, new ThisExpr(), new NodeList<>(), new SimpleName());
+        this(null, new ThisExpr(), new NodeList<>(), new SimpleName());
     }
 
     public FieldAccessExpr(final Expression scope, final String field) {
-        this(Range.UNKNOWN, scope, new NodeList<>(), new SimpleName(field));
+        this(null, scope, new NodeList<>(), new SimpleName(field));
     }
 
     public FieldAccessExpr(final Range range, final Expression scope, final NodeList<Type<?>> typeArguments,
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/InstanceOfExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/InstanceOfExpr.java
index d7cb9f2d3..42ab7d5fc 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/InstanceOfExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/InstanceOfExpr.java
@@ -41,11 +41,11 @@ public final class InstanceOfExpr extends Expression implements NodeWithType<Ins
 	private ReferenceType<?> type;
 
 	public InstanceOfExpr() {
-        this(Range.UNKNOWN, new NameExpr(), new ClassOrInterfaceType());
+        this(null, new NameExpr(), new ClassOrInterfaceType());
 	}
 
 	public InstanceOfExpr(final Expression expr, final ReferenceType<?> type) {
-        this(Range.UNKNOWN, expr, type);
+        this(null, expr, type);
 	}
 
 	public InstanceOfExpr(final Range range, final Expression expr, final ReferenceType<?> type) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralExpr.java
index a4a09cff0..30535fdc4 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralExpr.java
@@ -35,11 +35,11 @@ public class IntegerLiteralExpr extends StringLiteralExpr {
 	static final String MIN_VALUE = "-" + UNSIGNED_MIN_VALUE;
 
 	public IntegerLiteralExpr() {
-        this(Range.UNKNOWN, "0");
+        this(null, "0");
 	}
 
 	public IntegerLiteralExpr(final String value) {
-		this(Range.UNKNOWN, value);
+		this(null, value);
 	}
 
 	public IntegerLiteralExpr(final Range range, final String value) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralMinValueExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralMinValueExpr.java
index d9ffb7d44..b6cea4510 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralMinValueExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralMinValueExpr.java
@@ -31,7 +31,7 @@ import com.github.javaparser.ast.visitor.VoidVisitor;
 public final class IntegerLiteralMinValueExpr extends IntegerLiteralExpr {
 
 	public IntegerLiteralMinValueExpr() {
-		this(Range.UNKNOWN);
+		this(null);
 	}
 
 	public IntegerLiteralMinValueExpr(final Range range) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java
index faa6ca201..da80db38c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java
@@ -49,7 +49,7 @@ public class LambdaExpr extends Expression implements
 	private Statement body;
 
 	public LambdaExpr() {
-        this(Range.UNKNOWN,
+        this(null,
                 new NodeList<>(),
                 new EmptyStmt(),
                 false);
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java
index 8c22793ba..b8101ae9a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java
@@ -35,7 +35,7 @@ public class LongLiteralExpr extends StringLiteralExpr {
 	protected static final String MIN_VALUE = "-" + UNSIGNED_MIN_VALUE + "L";
 
 	public LongLiteralExpr() {
-        this(Range.UNKNOWN, "0");
+        this(null, "0");
 	}
 
 	public LongLiteralExpr(final String value) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LongLiteralMinValueExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LongLiteralMinValueExpr.java
index 60237c079..b935fb813 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LongLiteralMinValueExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LongLiteralMinValueExpr.java
@@ -31,7 +31,7 @@ import com.github.javaparser.ast.visitor.VoidVisitor;
 public final class LongLiteralMinValueExpr extends LongLiteralExpr {
 
 	public LongLiteralMinValueExpr() {
-		this(Range.UNKNOWN);
+		this(null);
 	}
 
 	public LongLiteralMinValueExpr(final Range range) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java
index 55d8b0180..8a7bc6db4 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java
@@ -31,11 +31,11 @@ import com.github.javaparser.ast.visitor.VoidVisitor;
 public final class MarkerAnnotationExpr extends AnnotationExpr {
 
     public MarkerAnnotationExpr() {
-        this(Range.UNKNOWN, new Name());
+        this(null, new Name());
     }
 
     public MarkerAnnotationExpr(final Name name) {
-        this(Range.UNKNOWN, name);
+        this(null, name);
     }
 
     public MarkerAnnotationExpr(final Range range, final Name name) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MemberValuePair.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MemberValuePair.java
index 5096e4b60..42aacdcc9 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MemberValuePair.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MemberValuePair.java
@@ -39,15 +39,15 @@ public final class MemberValuePair extends Node implements NodeWithSimpleName<Me
 	private Expression value;
 
 	public MemberValuePair() {
-        this(Range.UNKNOWN, new SimpleName(), new StringLiteralExpr());
+        this(null, new SimpleName(), new StringLiteralExpr());
 	}
 
 	public MemberValuePair(final String name, final Expression value) {
-        this(Range.UNKNOWN, new SimpleName(name), value);
+        this(null, new SimpleName(name), value);
 	}
 
 	public MemberValuePair(final SimpleName name, final Expression value) {
-        this(Range.UNKNOWN, name, value);
+        this(null, name, value);
 	}
 
 	public MemberValuePair(final Range range, final SimpleName name, final Expression value) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java
index 901fee265..8df8e5699 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java
@@ -51,7 +51,7 @@ public final class MethodCallExpr extends Expression implements
     private NodeList<Expression> args;
 
     public MethodCallExpr() {
-        this(Range.UNKNOWN,
+        this(null,
                 null,
                 new NodeList<>(),
                 new SimpleName(),
@@ -59,7 +59,7 @@ public final class MethodCallExpr extends Expression implements
     }
 
     public MethodCallExpr(final Expression scope, final String name) {
-        this(Range.UNKNOWN,
+        this(null,
                 scope,
                 new NodeList<>(),
                 new SimpleName(name),
@@ -67,7 +67,7 @@ public final class MethodCallExpr extends Expression implements
     }
 
     public MethodCallExpr(final Expression scope, final SimpleName name, final NodeList<Expression> args) {
-        this(Range.UNKNOWN,
+        this(null,
                 scope,
                 new NodeList<>(),
                 name,
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodReferenceExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodReferenceExpr.java
index 422afb489..2c96b41bb 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodReferenceExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodReferenceExpr.java
@@ -49,7 +49,7 @@ public class MethodReferenceExpr extends Expression implements NodeWithTypeArgum
     private String identifier;
 
     public MethodReferenceExpr() {
-        this(Range.UNKNOWN,
+        this(null,
                 new ClassExpr(),
                 null,
                 "empty");
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Name.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Name.java
index 24bb1542c..39e0ef6a1 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Name.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Name.java
@@ -46,15 +46,15 @@ public class Name extends Node {
     private Name qualifier;
 
     public Name() {
-        this(Range.UNKNOWN, null, "empty");
+        this(null, null, "empty");
     }
 
     public Name(final String id) {
-        this(Range.UNKNOWN, null, id);
+        this(null, null, id);
     }
 
     public Name(Name qualifier, final String id) {
-        this(Range.UNKNOWN, qualifier, id);
+        this(null, qualifier, id);
     }
 
     public Name(Range range, Name qualifier, final String id) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NameExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NameExpr.java
index 6bfd842b6..c50de8a14 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NameExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NameExpr.java
@@ -36,11 +36,11 @@ public class NameExpr extends Expression implements NodeWithSimpleName<NameExpr>
     private SimpleName name;
 
     public NameExpr() {
-        this(Range.UNKNOWN, new SimpleName());
+        this(null, new SimpleName());
     }
 
     public NameExpr(final String name) {
-        this(Range.UNKNOWN, new SimpleName(name));
+        this(null, new SimpleName(name));
     }
 
     public NameExpr(final SimpleName name) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NormalAnnotationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NormalAnnotationExpr.java
index 03b8fa276..0cb5b2881 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NormalAnnotationExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NormalAnnotationExpr.java
@@ -36,11 +36,11 @@ public final class NormalAnnotationExpr extends AnnotationExpr {
     private NodeList<MemberValuePair> pairs;
 
     public NormalAnnotationExpr() {
-        this(Range.UNKNOWN, new Name(), new NodeList<>());
+        this(null, new Name(), new NodeList<>());
     }
 
     public NormalAnnotationExpr(final Name name, final NodeList<MemberValuePair> pairs) {
-        this(Range.UNKNOWN, name, pairs);
+        this(null, name, pairs);
     }
 
     public NormalAnnotationExpr(final Range range, final Name name, final NodeList<MemberValuePair> pairs) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NullLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NullLiteralExpr.java
index f6c492516..2c88913f0 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NullLiteralExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NullLiteralExpr.java
@@ -31,7 +31,7 @@ import com.github.javaparser.ast.visitor.VoidVisitor;
 public final class NullLiteralExpr extends LiteralExpr {
 
 	public NullLiteralExpr() {
-        this(Range.UNKNOWN);
+        this(null);
 	}
 
 	public NullLiteralExpr(final Range range) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ObjectCreationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ObjectCreationExpr.java
index 9b8b62adb..1dde2437a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ObjectCreationExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ObjectCreationExpr.java
@@ -62,7 +62,7 @@ public final class ObjectCreationExpr extends Expression implements
     private NodeList<BodyDeclaration<?>> anonymousClassBody;
 
     public ObjectCreationExpr() {
-        this(Range.UNKNOWN,
+        this(null,
                 null,
                 new ClassOrInterfaceType(),
                 new NodeList<>(),
@@ -79,7 +79,7 @@ public final class ObjectCreationExpr extends Expression implements
      */
     public ObjectCreationExpr(final Expression scope, final ClassOrInterfaceType type,
                               final NodeList<Expression> args) {
-        this(Range.UNKNOWN,
+        this(null,
                 scope,
                 type,
                 new NodeList<>(),
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SimpleName.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SimpleName.java
index b846408ca..965fcf665 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SimpleName.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SimpleName.java
@@ -16,11 +16,11 @@ public class SimpleName extends Node {
     private String id;
 
     public SimpleName() {
-        this(Range.UNKNOWN, "empty");
+        this(null, "empty");
     }
 
     public SimpleName(final String id) {
-        this(Range.UNKNOWN, id);
+        this(null, id);
     }
 
     public SimpleName(Range range, final String id) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java
index d5013de33..af14a81a3 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java
@@ -33,11 +33,11 @@ public final class SingleMemberAnnotationExpr extends AnnotationExpr {
 	private Expression memberValue;
 
 	public SingleMemberAnnotationExpr() {
-        this(Range.UNKNOWN, new Name(), new StringLiteralExpr());
+        this(null, new Name(), new StringLiteralExpr());
 	}
 
 	public SingleMemberAnnotationExpr(final Name name, final Expression memberValue) {
-        this(Range.UNKNOWN, name, memberValue);
+        this(null, name, memberValue);
 	}
 
 	public SingleMemberAnnotationExpr(final Range range, final Name name, final Expression memberValue) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/StringLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/StringLiteralExpr.java
index 0eeb21ed0..1bae11622 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/StringLiteralExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/StringLiteralExpr.java
@@ -37,11 +37,11 @@ public class StringLiteralExpr extends LiteralExpr {
 	protected String value;
 
 	public StringLiteralExpr() {
-        this(Range.UNKNOWN, "empty");
+        this(null, "empty");
 	}
 
 	public StringLiteralExpr(final String value) {
-		this(Range.UNKNOWN, value);
+		this(null, value);
 	}
 
 	/**
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SuperExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SuperExpr.java
index d925811b1..1113fd85b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SuperExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SuperExpr.java
@@ -35,11 +35,11 @@ public final class SuperExpr extends Expression {
 	private Expression classExpr;
 
 	public SuperExpr() {
-        this(Range.UNKNOWN, null);
+        this(null, null);
 	}
 
 	public SuperExpr(final Expression classExpr) {
-		this(Range.UNKNOWN, classExpr);
+		this(null, classExpr);
 	}
 
 	public SuperExpr(final Range range, final Expression classExpr) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ThisExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ThisExpr.java
index 646216363..463e917ee 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ThisExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ThisExpr.java
@@ -34,11 +34,11 @@ public final class ThisExpr extends Expression {
 	private Expression classExpr;
 
 	public ThisExpr() {
-        this(Range.UNKNOWN, null); 
+        this(null, null); 
 	}
 
 	public ThisExpr(final Expression classExpr) {
-		this(Range.UNKNOWN, classExpr);
+		this(null, classExpr);
 	}
 
 	public ThisExpr(final Range range, final Expression classExpr) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TypeExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TypeExpr.java
index 7a3bd07f6..d16848643 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TypeExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TypeExpr.java
@@ -40,7 +40,7 @@ public class TypeExpr extends Expression implements NodeWithType<TypeExpr, Type<
     private Type<?> type;
 
     public TypeExpr() {
-        this(Range.UNKNOWN, new ClassOrInterfaceType());
+        this(null, new ClassOrInterfaceType());
     }
 
     public TypeExpr(Range range, Type<?> type) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/UnaryExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/UnaryExpr.java
index 1331f6be7..4ac239dd3 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/UnaryExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/UnaryExpr.java
@@ -46,11 +46,11 @@ public final class UnaryExpr extends Expression {
 	private Operator op;
 
 	public UnaryExpr() {
-        this(Range.UNKNOWN, new IntegerLiteralExpr(), Operator.postIncrement);
+        this(null, new IntegerLiteralExpr(), Operator.postIncrement);
 	}
 
 	public UnaryExpr(final Expression expr, final Operator op) {
-        this(Range.UNKNOWN, expr, op);
+        this(null, expr, op);
 	}
 
 	public UnaryExpr(final Range range, final Expression expr, final Operator op) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/VariableDeclarationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/VariableDeclarationExpr.java
index 065e788d4..1016be3e3 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/VariableDeclarationExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/VariableDeclarationExpr.java
@@ -64,7 +64,7 @@ public final class VariableDeclarationExpr extends Expression implements
     private NodeList<ArrayBracketPair> arrayBracketPairsAfterType;
 
     public VariableDeclarationExpr() {
-        this(Range.UNKNOWN,
+        this(null,
                 EnumSet.noneOf(Modifier.class),
                 new NodeList<>(),
                 new ClassOrInterfaceType(),
@@ -73,7 +73,7 @@ public final class VariableDeclarationExpr extends Expression implements
     }
 
     public VariableDeclarationExpr(final Type elementType, String variableName) {
-        this(Range.UNKNOWN,
+        this(null,
                 EnumSet.noneOf(Modifier.class),
                 new NodeList<>(),
                 elementType,
@@ -82,7 +82,7 @@ public final class VariableDeclarationExpr extends Expression implements
     }
 
     public VariableDeclarationExpr(final Type elementType, VariableDeclarator var) {
-        this(Range.UNKNOWN,
+        this(null,
                 EnumSet.noneOf(Modifier.class),
                 new NodeList<>(),
                 elementType,
@@ -91,7 +91,7 @@ public final class VariableDeclarationExpr extends Expression implements
     }
 
     public VariableDeclarationExpr(final Type elementType, String variableName, Modifier... modifiers) {
-        this(Range.UNKNOWN,
+        this(null,
                 Arrays.stream(modifiers).collect(Collectors.toCollection(() -> EnumSet.noneOf(Modifier.class))),
                 new NodeList<>(),
                 elementType,
@@ -100,7 +100,7 @@ public final class VariableDeclarationExpr extends Expression implements
     }
 
     public VariableDeclarationExpr(final Type elementType, VariableDeclarator var, Modifier... modifiers) {
-        this(Range.UNKNOWN,
+        this(null,
                 Arrays.stream(modifiers).collect(Collectors.toCollection(() -> EnumSet.noneOf(Modifier.class))),
                 new NodeList<>(),
                 elementType,
@@ -109,7 +109,7 @@ public final class VariableDeclarationExpr extends Expression implements
     }
 
     public VariableDeclarationExpr(final Type elementType, final NodeList<VariableDeclarator> variables) {
-        this(Range.UNKNOWN,
+        this(null,
                 EnumSet.noneOf(Modifier.class),
                 new NodeList<>(),
                 elementType,
@@ -119,7 +119,7 @@ public final class VariableDeclarationExpr extends Expression implements
 
     public VariableDeclarationExpr(final EnumSet<Modifier> modifiers, final Type elementType,
                                    final NodeList<VariableDeclarator> variables) {
-        this(Range.UNKNOWN,
+        this(null,
                 modifiers,
                 new NodeList<>(),
                 elementType,
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/imports/EmptyImportDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/imports/EmptyImportDeclaration.java
index 7fb763599..dd67717fa 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/imports/EmptyImportDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/imports/EmptyImportDeclaration.java
@@ -11,7 +11,7 @@ import com.github.javaparser.ast.visitor.VoidVisitor;
 public class EmptyImportDeclaration extends ImportDeclaration {
     
     public EmptyImportDeclaration() {
-        this(Range.UNKNOWN);
+        this(null);
     }
 
     public EmptyImportDeclaration(Range range) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/imports/ImportDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/imports/ImportDeclaration.java
index 47bb94889..6e96d291f 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/imports/ImportDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/imports/ImportDeclaration.java
@@ -50,7 +50,7 @@ import static com.github.javaparser.utils.Utils.assertNotNull;
  */
 public abstract class ImportDeclaration extends Node {
     public ImportDeclaration() {
-        this(Range.UNKNOWN);
+        this(null);
     }
 
     public ImportDeclaration(Range range) {
@@ -60,13 +60,12 @@ public abstract class ImportDeclaration extends Node {
     /**
      * Factory method for import declarations.
      *
-     * @param range      the range the import declaration covers. Range.UNKNOWN if not known.
+     * @param range      the range the import declaration covers. null if not known.
      * @param name       the qualified name of the import.
      * @param isStatic   whether the import is static.
      * @param isAsterisk whether the import is on demand.
      */
     public static ImportDeclaration create(Range range, Name name, boolean isStatic, boolean isAsterisk) {
-        assertNotNull(range);
         assertNotNull(name);
         if (isStatic) {
             if (isAsterisk) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/imports/SingleStaticImportDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/imports/SingleStaticImportDeclaration.java
index ca04b15bf..79ee7e5d4 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/imports/SingleStaticImportDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/imports/SingleStaticImportDeclaration.java
@@ -18,7 +18,7 @@ public class SingleStaticImportDeclaration extends NonEmptyImportDeclaration {
     private String staticMember;
 
     public SingleStaticImportDeclaration() {
-        this(Range.UNKNOWN, new ClassOrInterfaceType(), "empty");
+        this(null, new ClassOrInterfaceType(), "empty");
     }
 
     public SingleStaticImportDeclaration(Range range, ClassOrInterfaceType type, String staticMember) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/imports/SingleTypeImportDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/imports/SingleTypeImportDeclaration.java
index ec8e89180..7ce057140 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/imports/SingleTypeImportDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/imports/SingleTypeImportDeclaration.java
@@ -15,7 +15,7 @@ public class SingleTypeImportDeclaration extends NonEmptyImportDeclaration {
     private ClassOrInterfaceType type;
 
     public SingleTypeImportDeclaration() {
-        this(Range.UNKNOWN, new ClassOrInterfaceType());
+        this(null, new ClassOrInterfaceType());
     }
 
     public SingleTypeImportDeclaration(Range range, ClassOrInterfaceType type) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/imports/StaticImportOnDemandDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/imports/StaticImportOnDemandDeclaration.java
index 289382943..0dccb3c6b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/imports/StaticImportOnDemandDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/imports/StaticImportOnDemandDeclaration.java
@@ -15,7 +15,7 @@ public class StaticImportOnDemandDeclaration extends NonEmptyImportDeclaration {
     private ClassOrInterfaceType type;
 
     public StaticImportOnDemandDeclaration() {
-        this(Range.UNKNOWN, new ClassOrInterfaceType());
+        this(null, new ClassOrInterfaceType());
     }
 
     public StaticImportOnDemandDeclaration(Range range, ClassOrInterfaceType type) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/imports/TypeImportOnDemandDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/imports/TypeImportOnDemandDeclaration.java
index 9330edd59..dc6b4e3d9 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/imports/TypeImportOnDemandDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/imports/TypeImportOnDemandDeclaration.java
@@ -23,7 +23,7 @@ public class TypeImportOnDemandDeclaration extends NonEmptyImportDeclaration imp
     private Name name;
 
     public TypeImportOnDemandDeclaration() {
-        this(Range.UNKNOWN, new Name());
+        this(null, new Name());
     }
     
     public TypeImportOnDemandDeclaration(Range range, Name name) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java
index d265a1b05..9ff753d22 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java
@@ -41,15 +41,15 @@ public final class AssertStmt extends Statement {
     private Expression msg;
 
     public AssertStmt() {
-        this(Range.UNKNOWN, new BooleanLiteralExpr(), null);
+        this(null, new BooleanLiteralExpr(), null);
     }
 
     public AssertStmt(final Expression check) {
-        this(Range.UNKNOWN, check, null);
+        this(null, check, null);
     }
 
     public AssertStmt(final Expression check, final Expression msg) {
-        this(Range.UNKNOWN, check, msg);
+        this(null, check, msg);
     }
 
     public AssertStmt(final Range range, final Expression check, final Expression msg) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java
index 53d3957f1..60794be61 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java
@@ -37,11 +37,11 @@ public final class BlockStmt extends Statement implements NodeWithStatements<Blo
     private NodeList<Statement> stmts;
 
     public BlockStmt() {
-        this(Range.UNKNOWN, new NodeList<>());
+        this(null, new NodeList<>());
     }
 
     public BlockStmt(final NodeList<Statement> stmts) {
-        this(Range.UNKNOWN, stmts);
+        this(null, stmts);
 
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java
index 8c54f98d8..5b79c485e 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java
@@ -37,11 +37,11 @@ public final class BreakStmt extends Statement {
     private String id;
 
     public BreakStmt() {
-        this(Range.UNKNOWN, "empty");
+        this(null, "empty");
     }
 
     public BreakStmt(final String id) {
-        this(Range.UNKNOWN, id);
+        this(null, id);
     }
 
     public BreakStmt(final Range range, final String id) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/CatchClause.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/CatchClause.java
index 84b18ee73..20f0bf6bb 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/CatchClause.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/CatchClause.java
@@ -46,11 +46,11 @@ public final class CatchClause extends Node implements NodeWithBlockStmt<CatchCl
     private BlockStmt catchBlock;
 
     public CatchClause() {
-        this(Range.UNKNOWN, new Parameter(), new BlockStmt());         
+        this(null, new Parameter(), new BlockStmt());         
     }
 
     public CatchClause(final Parameter param, final BlockStmt catchBlock) {
-        this(Range.UNKNOWN, param, catchBlock);
+        this(null, param, catchBlock);
     }
 
     public CatchClause(final EnumSet<Modifier> exceptModifier,
@@ -58,8 +58,8 @@ public final class CatchClause extends Node implements NodeWithBlockStmt<CatchCl
                        final ClassOrInterfaceType exceptType,
                        final VariableDeclaratorId exceptId,
                        final BlockStmt catchBlock) {
-        this(Range.UNKNOWN, 
-                new Parameter(Range.UNKNOWN, 
+        this(null, 
+                new Parameter(null, 
                         exceptModifier, 
                         exceptAnnotations, 
                         exceptType, 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java
index a7e3e09ec..8f2fab965 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java
@@ -37,11 +37,11 @@ public final class ContinueStmt extends Statement {
 	private String id;
 
 	public ContinueStmt() {
-        this(Range.UNKNOWN, null);
+        this(null, null);
 	}
 
 	public ContinueStmt(final String id) {
-		this(Range.UNKNOWN, id);
+		this(null, id);
 	}
 
 	public ContinueStmt(Range range, final String id) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/DoStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/DoStmt.java
index 00614de99..7d5513a9f 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/DoStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/DoStmt.java
@@ -38,11 +38,11 @@ public final class DoStmt extends Statement implements NodeWithBody<DoStmt> {
 	private Expression condition;
 
 	public DoStmt() {
-        this(Range.UNKNOWN, new EmptyStmt(), new BooleanLiteralExpr());
+        this(null, new EmptyStmt(), new BooleanLiteralExpr());
 	}
 
 	public DoStmt(final Statement body, final Expression condition) {
-        this(Range.UNKNOWN, body, condition);
+        this(null, body, condition);
 	}
 
 	public DoStmt(Range range, final Statement body, final Expression condition) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/EmptyStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/EmptyStmt.java
index 36e56795d..9a5f9d2a8 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/EmptyStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/EmptyStmt.java
@@ -31,7 +31,7 @@ import com.github.javaparser.ast.visitor.VoidVisitor;
 public final class EmptyStmt extends Statement {
 
 	public EmptyStmt() {
-        this(Range.UNKNOWN);
+        this(null);
 	}
 
 	public EmptyStmt(Range range) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java
index 60fa6d120..4e746d4b9 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java
@@ -47,12 +47,12 @@ public final class ExplicitConstructorInvocationStmt extends Statement implement
 	private NodeList<Expression> args;
 
 	public ExplicitConstructorInvocationStmt() {
-		this(Range.UNKNOWN, new NodeList<>(), true, null, new NodeList<>());
+		this(null, new NodeList<>(), true, null, new NodeList<>());
 	}
 
 	public ExplicitConstructorInvocationStmt(final boolean isThis,
 			final Expression expr, final NodeList<Expression> args) {
-		this(Range.UNKNOWN, new NodeList<>(), isThis, expr, args);
+		this(null, new NodeList<>(), isThis, expr, args);
 	}
 
 	public ExplicitConstructorInvocationStmt(Range range,
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExpressionStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExpressionStmt.java
index 93dad73c3..14ae255e2 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExpressionStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExpressionStmt.java
@@ -37,11 +37,11 @@ public final class ExpressionStmt extends Statement {
 	private Expression expr;
 
 	public ExpressionStmt() {
-        this(Range.UNKNOWN, new BooleanLiteralExpr());
+        this(null, new BooleanLiteralExpr());
 	}
 
 	public ExpressionStmt(final Expression expr) {
-		this(Range.UNKNOWN, expr);
+		this(null, expr);
 	}
 
 	public ExpressionStmt(Range range, final Expression expr) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java
index 6e70215d3..2837a4c43 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java
@@ -47,7 +47,7 @@ public final class ForStmt extends Statement implements NodeWithBody<ForStmt> {
     private Statement body;
 
     public ForStmt() {
-        this(Range.UNKNOWN,
+        this(null,
                 new NodeList<>(),
                 new BooleanLiteralExpr(),
                 new NodeList<>(),
@@ -56,7 +56,7 @@ public final class ForStmt extends Statement implements NodeWithBody<ForStmt> {
 
     public ForStmt(final NodeList<Expression> init, final Expression compare,
                    final NodeList<Expression> update, final Statement body) {
-        this(Range.UNKNOWN, init, compare, update, body);
+        this(null, init, compare, update, body);
     }
 
     public ForStmt(Range range,
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForeachStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForeachStmt.java
index b289ed477..178818d95 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForeachStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForeachStmt.java
@@ -43,7 +43,7 @@ public final class ForeachStmt extends Statement implements NodeWithBody<Foreach
     private Statement body;
 
     public ForeachStmt() {
-        this(Range.UNKNOWN,
+        this(null,
                 new VariableDeclarationExpr(),
                 new NameExpr(),
                 new EmptyStmt());
@@ -51,7 +51,7 @@ public final class ForeachStmt extends Statement implements NodeWithBody<Foreach
 
     public ForeachStmt(final VariableDeclarationExpr var,
                        final Expression iterable, final Statement body) {
-        this(Range.UNKNOWN, var, iterable, body);
+        this(null, var, iterable, body);
     }
 
     public ForeachStmt(Range range,
@@ -64,7 +64,7 @@ public final class ForeachStmt extends Statement implements NodeWithBody<Foreach
     }
 
     public ForeachStmt(VariableDeclarationExpr var, String iterable, BlockStmt body) {
-        this(Range.UNKNOWN, var, new NameExpr(iterable), body);
+        this(null, var, new NameExpr(iterable), body);
     }
 
     @Override
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/IfStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/IfStmt.java
index 91e713bf4..56b208ea2 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/IfStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/IfStmt.java
@@ -43,14 +43,14 @@ public final class IfStmt extends Statement {
 	private Statement elseStmt;
 
 	public IfStmt() {
-        this(Range.UNKNOWN,
+        this(null,
                 new BooleanLiteralExpr(),
                 new EmptyStmt(),
                 null);
 	}
 
 	public IfStmt(final Expression condition, final Statement thenStmt, final Statement elseStmt) {
-        this(Range.UNKNOWN, condition, thenStmt, elseStmt);
+        this(null, condition, thenStmt, elseStmt);
 	}
 
 	public IfStmt(Range range,
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java
index 5e3c228a9..54b2d7546 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java
@@ -37,11 +37,11 @@ public final class LabeledStmt extends Statement {
 	private Statement stmt;
 
 	public LabeledStmt() {
-        this(Range.UNKNOWN, "empty", new EmptyStmt());
+        this(null, "empty", new EmptyStmt());
 	}
 
 	public LabeledStmt(final String label, final Statement stmt) {
-        this(Range.UNKNOWN, label, stmt);
+        this(null, label, stmt);
 	}
 
 	public LabeledStmt(Range range, final String label, final Statement stmt) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ReturnStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ReturnStmt.java
index 45b5a6271..0b08698e2 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ReturnStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ReturnStmt.java
@@ -37,11 +37,11 @@ public final class ReturnStmt extends Statement {
 	private Expression expr;
 
 	public ReturnStmt() {
-        this(Range.UNKNOWN, null);
+        this(null, null);
 	}
 
 	public ReturnStmt(final Expression expr) {
-		this(Range.UNKNOWN, expr);
+		this(null, expr);
 	}
 
 	public ReturnStmt(Range range, final Expression expr) {
@@ -53,7 +53,7 @@ public final class ReturnStmt extends Statement {
      * Will create a NameExpr with the string param
      */
     public ReturnStmt(String expr) {
-        this(Range.UNKNOWN, new NameExpr(expr));
+        this(null, new NameExpr(expr));
     }
 
     @Override
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchEntryStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchEntryStmt.java
index 412e5073b..c60848653 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchEntryStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchEntryStmt.java
@@ -42,11 +42,11 @@ public final class SwitchEntryStmt extends Statement implements NodeWithStatemen
 	private NodeList<Statement> stmts;
 
 	public SwitchEntryStmt() {
-		this(Range.UNKNOWN, null, new NodeList<>());
+		this(null, null, new NodeList<>());
 	}
 
 	public SwitchEntryStmt(final Expression label, final NodeList<Statement> stmts) {
-		this(Range.UNKNOWN, label, stmts);
+		this(null, label, stmts);
 	}
 
 	public SwitchEntryStmt(Range range, final Expression label,
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchStmt.java
index 550376722..3f48cf06a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchStmt.java
@@ -40,12 +40,12 @@ public final class SwitchStmt extends Statement {
 	private NodeList<SwitchEntryStmt> entries;
 
 	public SwitchStmt() {
-		this(Range.UNKNOWN, new NameExpr(), new NodeList<>());
+		this(null, new NameExpr(), new NodeList<>());
 	}
 
 	public SwitchStmt(final Expression selector,
 			final NodeList<SwitchEntryStmt> entries) {
-		this(Range.UNKNOWN, selector, entries);
+		this(null, selector, entries);
 	}
 
 	public SwitchStmt(Range range, final Expression selector,
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SynchronizedStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SynchronizedStmt.java
index d409a23ae..1206638a7 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SynchronizedStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SynchronizedStmt.java
@@ -40,11 +40,11 @@ public final class SynchronizedStmt extends Statement implements NodeWithBlockSt
     private BlockStmt block;
 
     public SynchronizedStmt() {
-        this(Range.UNKNOWN, new NameExpr(), new BlockStmt());
+        this(null, new NameExpr(), new BlockStmt());
     }
 
     public SynchronizedStmt(final Expression expr, final BlockStmt block) {
-        this(Range.UNKNOWN, expr, block);
+        this(null, expr, block);
     }
 
     public SynchronizedStmt(Range range, final Expression expr, final BlockStmt block) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ThrowStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ThrowStmt.java
index 991299fa9..4c5111186 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ThrowStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ThrowStmt.java
@@ -35,11 +35,11 @@ public final class ThrowStmt extends Statement {
 	private Expression expr;
 
 	public ThrowStmt() {
-        this(Range.UNKNOWN, new NameExpr());
+        this(null, new NameExpr());
 	}
 
 	public ThrowStmt(final Expression expr) {
-		this(Range.UNKNOWN, expr);
+		this(null, expr);
 	}
 
 	public ThrowStmt(Range range, final Expression expr) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java
index 18a942729..a27e5ff45 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java
@@ -45,7 +45,7 @@ public final class TryStmt extends Statement {
 	private BlockStmt finallyBlock;
 
 	public TryStmt() {
-		this(Range.UNKNOWN,
+		this(null,
 				new NodeList<>(),
                 new BlockStmt(),
 				new NodeList<>(),
@@ -54,7 +54,7 @@ public final class TryStmt extends Statement {
 
 	public TryStmt(final BlockStmt tryBlock, final NodeList<CatchClause> catchs,
 			final BlockStmt finallyBlock) {
-		this(Range.UNKNOWN,
+		this(null,
 				new NodeList<>(),
 				tryBlock,
 				catchs,
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/TypeDeclarationStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/TypeDeclarationStmt.java
index f42e679c7..0bfbc717f 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/TypeDeclarationStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/TypeDeclarationStmt.java
@@ -37,11 +37,11 @@ public final class TypeDeclarationStmt extends Statement {
 	private TypeDeclaration typeDecl;
 
 	public TypeDeclarationStmt() {
-        this(Range.UNKNOWN, new EmptyTypeDeclaration());
+        this(null, new EmptyTypeDeclaration());
 	}
 
 	public TypeDeclarationStmt(final TypeDeclaration typeDecl) {
-		this(Range.UNKNOWN, typeDecl);
+		this(null, typeDecl);
 	}
 
 	public TypeDeclarationStmt(Range range, final TypeDeclaration typeDecl) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/WhileStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/WhileStmt.java
index f96f356b0..8b6a95c1f 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/WhileStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/WhileStmt.java
@@ -38,11 +38,11 @@ public final class WhileStmt extends Statement implements NodeWithBody<WhileStmt
 	private Statement body;
 
 	public WhileStmt() {
-        this(Range.UNKNOWN, new BooleanLiteralExpr(), new EmptyStmt());
+        this(null, new BooleanLiteralExpr(), new EmptyStmt());
 	}
 
 	public WhileStmt(final Expression condition, final Statement body) {
-        this(Range.UNKNOWN, condition, body);
+        this(null, condition, body);
 	}
 
 	public WhileStmt(Range range, final Expression condition, final Statement body) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/ArrayType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/ArrayType.java
index 4142eb1ee..ccf120438 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/ArrayType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/ArrayType.java
@@ -20,7 +20,7 @@ public class ArrayType extends ReferenceType<ArrayType> implements NodeWithAnnot
     private Type componentType;
 
     public ArrayType(Type<?> componentType, NodeList<AnnotationExpr> annotations) {
-        this(Range.UNKNOWN, componentType, annotations);
+        this(null, componentType, annotations);
     }
 
     public ArrayType(Range range, Type<?> componentType, NodeList<AnnotationExpr> annotations) {
@@ -74,7 +74,7 @@ public class ArrayType extends ReferenceType<ArrayType> implements NodeWithAnnot
         final NodeList<ArrayBracketPair> arrayBracketPairs = new NodeList<>();
         while (type instanceof ArrayType) {
             ArrayType arrayType = (ArrayType) type;
-            arrayBracketPairs.add(new ArrayBracketPair(Range.UNKNOWN, arrayType.getAnnotations()));
+            arrayBracketPairs.add(new ArrayBracketPair(type.getRange(), arrayType.getAnnotations()));
             type = arrayType.getComponentType();
         }
         return new Pair<>(type, arrayBracketPairs);
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/ClassOrInterfaceType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/ClassOrInterfaceType.java
index 055f82c3f..06495b807 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/ClassOrInterfaceType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/ClassOrInterfaceType.java
@@ -48,21 +48,21 @@ public final class ClassOrInterfaceType extends ReferenceType<ClassOrInterfaceTy
     private NodeList<Type<?>> typeArguments;
 
     public ClassOrInterfaceType() {
-        this(Range.UNKNOWN,
+        this(null,
                 null,
                 new SimpleName(),
                 null);
     }
 
     public ClassOrInterfaceType(final String name) {
-        this(Range.UNKNOWN,
+        this(null,
                 null,
                 new SimpleName(name),
                 null);
     }
 
     public ClassOrInterfaceType(final ClassOrInterfaceType scope, final String name) {
-        this(Range.UNKNOWN,
+        this(null,
                 scope,
                 new SimpleName(name),
                 null);
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/IntersectionType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/IntersectionType.java
index 092138da1..2e8634390 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/IntersectionType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/IntersectionType.java
@@ -27,7 +27,7 @@ public class IntersectionType extends Type<IntersectionType> implements NodeWith
     private NodeList<ReferenceType<?>> elements;
 
     public IntersectionType(NodeList<ReferenceType<?>> elements) {
-        this(Range.UNKNOWN, elements);
+        this(null, elements);
     }
 
     public IntersectionType(Range range, NodeList<ReferenceType<?>> elements) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/PrimitiveType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/PrimitiveType.java
index cd50418fb..4f3b66d24 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/PrimitiveType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/PrimitiveType.java
@@ -81,11 +81,11 @@ public final class PrimitiveType extends Type<PrimitiveType> implements NodeWith
 	private Primitive type;
 
 	public PrimitiveType() {
-        this(Range.UNKNOWN, Primitive.Int);
+        this(null, Primitive.Int);
 	}
 
 	public PrimitiveType(final Primitive type) {
-        this(Range.UNKNOWN, type);
+        this(null, type);
 	}
 
 	public PrimitiveType(Range range, final Primitive type) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/ReferenceType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/ReferenceType.java
index e0419195e..f3a57b7e1 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/ReferenceType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/ReferenceType.java
@@ -30,7 +30,7 @@ import com.github.javaparser.ast.NodeList;
 public abstract class ReferenceType<T extends ReferenceType> extends Type<T> {
 
     public ReferenceType() {
-        this(Range.UNKNOWN);
+        this(null);
 	}
 
 	public ReferenceType(final Range range) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/TypeParameter.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/TypeParameter.java
index f38341101..70f5a1bb0 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/TypeParameter.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/TypeParameter.java
@@ -52,14 +52,14 @@ public final class TypeParameter extends ReferenceType<TypeParameter> implements
 	private NodeList<ClassOrInterfaceType> typeBound;
 
 	public TypeParameter() {
-		this(Range.UNKNOWN,
+		this(null,
 				new SimpleName(),
 				new NodeList<>(),
 				new NodeList<>());
 	}
 
 	public TypeParameter(final String name, final NodeList<ClassOrInterfaceType> typeBound) {
-		this(Range.UNKNOWN,
+		this(null,
 				new SimpleName(name),
 				typeBound,
 				new NodeList<>());
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnionType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnionType.java
index 322e100c7..86d500c42 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnionType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnionType.java
@@ -24,7 +24,7 @@ public class UnionType extends Type<UnionType> implements NodeWithAnnotations<Un
     }
 
     public UnionType(NodeList<ReferenceType<?>> elements) {
-        this(Range.UNKNOWN, elements);
+        this(null, elements);
     }
 
     public NodeList<ReferenceType<?>> getElements() {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnknownType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnknownType.java
index 54236b175..47bde07d4 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnknownType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnknownType.java
@@ -37,7 +37,7 @@ import com.github.javaparser.ast.visitor.VoidVisitor;
 public final class UnknownType extends Type<UnknownType> {
 
     public UnknownType() {
-        super(Range.UNKNOWN, new NodeList<>());
+        super(null, new NodeList<>());
     }
 
     @Override
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/VoidType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/VoidType.java
index fbc855202..9fa3fabff 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/VoidType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/VoidType.java
@@ -35,7 +35,7 @@ public final class VoidType extends Type<VoidType> implements NodeWithAnnotation
 	public static final VoidType VOID_TYPE = new VoidType();
 
 	public VoidType() {
-        this(Range.UNKNOWN);
+        this(null);
 	}
 
 	public VoidType(Range range) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/WildcardType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/WildcardType.java
index d0ccbd40a..36d5b5359 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/WildcardType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/WildcardType.java
@@ -39,15 +39,15 @@ public final class WildcardType extends Type<WildcardType> implements NodeWithAn
     private ReferenceType<?> sup;
 
 	public WildcardType() {
-        this(Range.UNKNOWN, null, null);
+        this(null, null, null);
 	}
 
 	public WildcardType(final ReferenceType<?> ext) {
-		this(Range.UNKNOWN, ext, null);
+		this(null, ext, null);
 	}
 
 	public WildcardType(final ReferenceType<?> ext, final ReferenceType<?> sup) {
-        this(Range.UNKNOWN, ext, sup);
+        this(null, ext, sup);
 	}
 
 	public WildcardType(final Range range,
diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/PositionUtils.java b/javaparser-core/src/main/java/com/github/javaparser/utils/PositionUtils.java
index a9ce7d27a..9da021878 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/utils/PositionUtils.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/utils/PositionUtils.java
@@ -21,11 +21,7 @@
  
 package com.github.javaparser.utils;
 
-import static java.lang.Integer.signum;
-
-import java.util.Collections;
-import java.util.List;
-
+import com.github.javaparser.Position;
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.NodeList;
 import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
@@ -35,6 +31,11 @@ import com.github.javaparser.ast.expr.AnnotationExpr;
 import com.github.javaparser.ast.nodeTypes.NodeWithAnnotations;
 import com.github.javaparser.ast.nodeTypes.NodeWithElementType;
 
+import java.util.Collections;
+import java.util.List;
+
+import static java.lang.Integer.signum;
+
 public final class PositionUtils {
 
     private PositionUtils() {
@@ -75,9 +76,12 @@ public final class PositionUtils {
             }
         }
 
-        int signLine = signum( a.getBegin().line - b.getBegin().line );
+        Position aBegin = a.getRange() == null ? Position.UNKNOWN : a.getRange().begin;
+        Position bBegin = b.getRange() == null ? Position.UNKNOWN : b.getRange().begin;
+
+        int signLine = signum(aBegin.line - bBegin.line);
         if (signLine == 0) {
-            return signum(a.getBegin().column - b.getBegin().column);
+            return signum(aBegin.column - bBegin.column);
         } else {
             return signLine;
         }
diff --git a/javaparser-core/src/main/javacc/java_1_8.jj b/javaparser-core/src/main/javacc/java_1_8.jj
index dc58eda46..a038176ff 100644
--- a/javaparser-core/src/main/javacc/java_1_8.jj
+++ b/javaparser-core/src/main/javacc/java_1_8.jj
@@ -209,7 +209,7 @@ final class ASTParser {
     }
 
     private static class RangedList<T extends Node> {
-        Range range = Range.UNKNOWN;
+        Range range = Range.range(0, 0, 0, 0);
         NodeList<T> list;
         RangedList(NodeList<T> list) {
             this.list = list;
@@ -1309,7 +1309,7 @@ CompilationUnit CompilationUnit():
   ( in = ImportDeclaration()      { begin = begin.orIfInvalid(in.getBegin()); imports = add(imports, in); } )*
   ( tn = TypeDeclaration() { begin = begin.orIfInvalid(tn.getBegin()); types = add(types, tn); } )*
   (<EOF> | "\u001A" /** ctrl+z char **/)
-  { return new CompilationUnit(begin.invalid() ? Range.UNKNOWN : range(begin, tokenEnd()), pakage, imports, types); }
+  { return new CompilationUnit(begin.invalid() ? Range.range(1,1,1,1) : range(begin, tokenEnd()), pakage, imports, types); }
 }
 
 PackageDeclaration PackageDeclaration():
@@ -3126,10 +3126,6 @@ SynchronizedStmt SynchronizedStatement():
 }
 
 TryStmt TryStatement():
-/*
- * Semantic check required here to make sure that at least one
- * finally/catch is present.
- */
 {
 	NodeList<VariableDeclarationExpr> resources = emptyList();
 	BlockStmt tryBlock;
@@ -3142,6 +3138,7 @@ TryStmt TryStatement():
 	VariableDeclaratorId exceptId;
 	Position begin;
 	Position catchBegin;
+	Position typesBegin;
 	Type type;
 }
 {
@@ -3152,7 +3149,7 @@ TryStmt TryStatement():
         LOOKAHEAD(2)
   		(
   			"catch" {catchBegin=tokenBegin();}
-  			"(" 
+  			"(" { typesBegin=tokenBegin(); }
   			exceptModifier = Modifiers() exceptionType = ReferenceType() { exceptionTypes.add(exceptionType); }
   			( "|" exceptionType = ReferenceTypeWithAnnotations() { exceptionTypes.add(exceptionType); } )*
   			exceptId = VariableDeclaratorId()
@@ -3161,11 +3158,11 @@ TryStmt TryStatement():
   			catchBlock = Block()
   			{
   			    if (exceptionTypes.size() > 1) {
-  			        type = new UnionType(exceptionTypes);
+  			        type = new UnionType(range(typesBegin, tokenEnd()), exceptionTypes);
   			    } else {
   			        type = (Type)exceptionTypes.get(0);
   			    }
-				Parameter catchType = new Parameter(Range.UNKNOWN, exceptModifier.modifiers, exceptModifier.annotations, type, emptyList(), false, exceptId);
+				Parameter catchType = new Parameter(type.getRange(), exceptModifier.modifiers, exceptModifier.annotations, type, emptyList(), false, exceptId);
   			    catchs = add(catchs, new CatchClause(range(catchBegin, tokenEnd()), catchType, catchBlock));
   			    exceptionTypes = emptyList(); }
   		)*
diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/NodePositionTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/NodePositionTest.java
index 4f09f6e6c..a97b7cce6 100644
--- a/javaparser-testing/src/test/java/com/github/javaparser/ast/NodePositionTest.java
+++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/NodePositionTest.java
@@ -30,9 +30,13 @@ public class NodePositionTest {
 
         CompilationUnit cu = res.getResult().get();
         getAllNodes(cu).forEach(n -> {
+            if (n.getRange() == null) {
+                throw new IllegalArgumentException("There should be no node without a range: " + n + " (class: "
+                        + n.getClass().getCanonicalName() + ")");
+            }
             if (n.getBegin().line == 0 && !n.toString().isEmpty() && !(n instanceof ArrayBracketPair)) {
                 throw new IllegalArgumentException("There should be no node at line 0: " + n + " (class: "
-                        + n.getClass().getCanonicalName()+ ")");
+                        + n.getClass().getCanonicalName() + ")");
             }
         });
     }
diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/imports/ImportDeclarationTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/imports/ImportDeclarationTest.java
index 248e107e8..f5a914e34 100644
--- a/javaparser-testing/src/test/java/com/github/javaparser/ast/imports/ImportDeclarationTest.java
+++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/imports/ImportDeclarationTest.java
@@ -1,6 +1,5 @@
 package com.github.javaparser.ast.imports;
 
-import static com.github.javaparser.Range.UNKNOWN;
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
@@ -10,14 +9,14 @@ import com.github.javaparser.ast.expr.Name;
 public class ImportDeclarationTest {
     @Test
     public void singleTypeImportDeclaration() {
-        ImportDeclaration importDeclaration = ImportDeclaration.create(UNKNOWN, Name.parse("a.b.c.X"), false, false);
+        ImportDeclaration importDeclaration = ImportDeclaration.create(null, Name.parse("a.b.c.X"), false, false);
         SingleTypeImportDeclaration i = (SingleTypeImportDeclaration) importDeclaration;
         assertEquals("a.b.c.X", i.getType().toString());
     }
 
     @Test
     public void typeImportOnDemandDeclaration() {
-        ImportDeclaration importDeclaration = ImportDeclaration.create(UNKNOWN, Name.parse("a.b.c.D"), false, true);
+        ImportDeclaration importDeclaration = ImportDeclaration.create(null, Name.parse("a.b.c.D"), false, true);
         TypeImportOnDemandDeclaration i = (TypeImportOnDemandDeclaration) importDeclaration;
         assertEquals("a.b.c.D", i.getName().toString());
         assertEquals("D", i.getName().getId());
@@ -25,7 +24,7 @@ public class ImportDeclarationTest {
 
     @Test
     public void singleStaticImportDeclaration() {
-        ImportDeclaration importDeclaration = ImportDeclaration.create(UNKNOWN, Name.parse("a.b.c.X.def"), true, false);
+        ImportDeclaration importDeclaration = ImportDeclaration.create(null, Name.parse("a.b.c.X.def"), true, false);
         SingleStaticImportDeclaration i = (SingleStaticImportDeclaration) importDeclaration;
         assertEquals("a.b.c.X", i.getType().toString());
         assertEquals("def", i.getStaticMember());
@@ -33,7 +32,7 @@ public class ImportDeclarationTest {
 
     @Test
     public void staticImportOnDemandDeclaration() {
-        ImportDeclaration importDeclaration = ImportDeclaration.create(UNKNOWN, Name.parse("a.b.c.X"), true, true);
+        ImportDeclaration importDeclaration = ImportDeclaration.create(null, Name.parse("a.b.c.X"), true, true);
         StaticImportOnDemandDeclaration i = (StaticImportOnDemandDeclaration) importDeclaration;
         assertEquals("X", i.getType().getNameAsString());
 		assertEquals("c", i.getType().getScope().get().getNameAsString());