diff --git a/src/comments.js b/src/comments.js
index e9ee47f546..cb31ad1383 100644
--- a/src/comments.js
+++ b/src/comments.js
@@ -74,7 +74,7 @@ pp.processComment = function (node) {
 
   if (lastChild) {
     if (lastChild.leadingComments) {
-      if (last(lastChild.leadingComments).range[1] <= node.range[0]) {
+      if (last(lastChild.leadingComments).end <= node.start) {
         node.leadingComments = lastChild.leadingComments;
         lastChild.leadingComments = null;
       } else {
@@ -82,7 +82,7 @@ pp.processComment = function (node) {
         // so this takes back the leading comment.
         // See Also: https://github.com/eslint/espree/issues/158
         for (i = lastChild.leadingComments.length - 2; i >= 0; --i) {
-          if (lastChild.leadingComments[i].range[1] <= node.range[0]) {
+          if (lastChild.leadingComments[i].end <= node.start) {
             node.leadingComments = lastChild.leadingComments.splice(0, i + 1);
             break;
           }
diff --git a/src/expression.js b/src/expression.js
index d1f926d836..8baf02aa62 100755
--- a/src/expression.js
+++ b/src/expression.js
@@ -16,9 +16,9 @@
 //
 // [opp]: http://en.wikipedia.org/wiki/Operator-precedence_parser
 
-import { types as tt } from "./tokentype";
+import { types as tt } from "./tokenizer/types";
 import { Parser } from "./state";
-import { reservedWords } from "./identifier";
+import { reservedWords } from "./util/identifier";
 
 const pp = Parser.prototype;
 
@@ -723,10 +723,12 @@ pp.parseFunctionBody = function (node, allowExpression) {
   if (this.strict || !isExpression && node.body.body.length && this.isUseStrict(node.body.body[0])) {
     let nameHash = Object.create(null), oldStrict = this.strict;
     this.strict = true;
-    if (node.id)
+    if (node.id) {
       this.checkLVal(node.id, true);
-    for (let i = 0; i < node.params.length; i++)
-      this.checkLVal(node.params[i], true, nameHash);
+    }
+    for (let param of (node.params: Array)) {
+      this.checkLVal(param, true, nameHash);
+    }
     this.strict = oldStrict;
   }
 };
diff --git a/src/index.js b/src/index.js
index b5647e85aa..5ee90a5404 100755
--- a/src/index.js
+++ b/src/index.js
@@ -1,5 +1,4 @@
 import { Parser, plugins } from "./state";
-import { getOptions } from "./options";
 import "./parseutil";
 import "./statement";
 import "./lval";
@@ -7,9 +6,9 @@ import "./expression";
 import "./node";
 import "./location";
 import "./lookahead";
-import { types as tokTypes } from "./tokentype";
-import "./tokenize";
-import "./tokencontext";
+import { types as tokTypes } from "./tokenizer/types";
+import "./tokenizer";
+import "./tokenizer/context";
 import "./comments";
 import flowPlugin from "./plugins/flow";
 import jsxPlugin from "./plugins/jsx";
@@ -18,7 +17,7 @@ plugins.flow = flowPlugin;
 plugins.jsx = jsxPlugin;
 
 export function parse(input, options) {
-  return new Parser(getOptions(options), input).parse();
+  return new Parser(options, input).parse();
 }
 
 export { tokTypes };
diff --git a/src/location.js b/src/location.js
index b4ec229707..8fa2cd9678 100755
--- a/src/location.js
+++ b/src/location.js
@@ -1,45 +1,5 @@
+import {Position, getLineInfo} from "./locutil";
 import { Parser } from "./state";
-import { lineBreakG } from "./whitespace";
-
-// These are used when `options.locations` is on, for the
-// `startLoc` and `endLoc` properties.
-
-export class Position {
-  constructor(line, col) {
-    this.line = line;
-    this.column = col;
-  }
-
-  offset(n) {
-    return new Position(this.line, this.column + n);
-  }
-}
-
-export class SourceLocation {
-  constructor(start, end) {
-    this.start = start;
-    this.end = end;
-  }
-}
-
-// The `getLineInfo` function is mostly useful when the
-// `locations` option is off (for performance reasons) and you
-// want to find the line/column position for a given character
-// offset. `input` should be the code string that the offset refers
-// into.
-
-export function getLineInfo(input, offset) {
-  for (let line = 1, cur = 0; ;) {
-    lineBreakG.lastIndex = cur;
-    let match = lineBreakG.exec(input);
-    if (match && match.index < offset) {
-      ++line;
-      cur = match.index + match[0].length;
-    } else {
-      return new Position(line, offset - cur);
-    }
-  }
-}
 
 const pp = Parser.prototype;
 
@@ -60,7 +20,5 @@ pp.raise = function (pos, message) {
 };
 
 pp.curPosition = function () {
-  if (this.options.locations) {
-    return new Position(this.curLine, this.pos - this.lineStart);
-  }
+  return new Position(this.curLine, this.pos - this.lineStart);
 };
diff --git a/src/locutil.js b/src/locutil.js
new file mode 100644
index 0000000000..796f5d0cdb
--- /dev/null
+++ b/src/locutil.js
@@ -0,0 +1,41 @@
+import { lineBreakG } from "./util/whitespace";
+
+// These are used when `options.locations` is on, for the
+// `startLoc` and `endLoc` properties.
+
+export class Position {
+  constructor(line, col) {
+    this.line = line;
+    this.column = col;
+  }
+
+  offset(n) {
+    return new Position(this.line, this.column + n);
+  }
+}
+
+export class SourceLocation {
+  constructor(start, end) {
+    this.start = start;
+    this.end = end;
+  }
+}
+
+// The `getLineInfo` function is mostly useful when the
+// `locations` option is off (for performance reasons) and you
+// want to find the line/column position for a given character
+// offset. `input` should be the code string that the offset refers
+// into.
+
+export function getLineInfo(input, offset) {
+  for (let line = 1, cur = 0; ;) {
+    lineBreakG.lastIndex = cur;
+    let match = lineBreakG.exec(input);
+    if (match && match.index < offset) {
+      ++line;
+      cur = match.index + match[0].length;
+    } else {
+      return new Position(line, offset - cur);
+    }
+  }
+}
diff --git a/src/lookahead.js b/src/lookahead.js
index 7ff04d587d..6bd4d00a45 100644
--- a/src/lookahead.js
+++ b/src/lookahead.js
@@ -30,8 +30,7 @@ var STATE_KEYS = [
 
 pp.getState = function () {
   var state = {};
-  for (var i = 0; i < STATE_KEYS.length; i++) {
-    var key = STATE_KEYS[i];
+  for (var key of (STATE_KEYS: Array)) {
     state[key] = this[key];
   }
   state.comments = this.comments.slice();
diff --git a/src/lval.js b/src/lval.js
index abd6793a79..25eb8e5dad 100755
--- a/src/lval.js
+++ b/src/lval.js
@@ -1,6 +1,6 @@
-import { types as tt } from "./tokentype";
+import { types as tt } from "./tokenizer/types";
 import { Parser } from "./state";
-import { reservedWords } from "./identifier";
+import { reservedWords } from "./util/identifier";
 
 const pp = Parser.prototype;
 
@@ -10,41 +10,40 @@ const pp = Parser.prototype;
 pp.toAssignable = function (node, isBinding) {
   if (node) {
     switch (node.type) {
-    case "Identifier":
-    case "ObjectPattern":
-    case "ArrayPattern":
-    case "AssignmentPattern":
-      break;
+      case "Identifier":
+      case "ObjectPattern":
+      case "ArrayPattern":
+      case "AssignmentPattern":
+        break;
 
-    case "ObjectExpression":
-      node.type = "ObjectPattern";
-      for (let i = 0; i < node.properties.length; i++) {
-        let prop = node.properties[i];
-        if (prop.type === "SpreadProperty") continue;
-        if (prop.kind !== "init") this.raise(prop.key.start, "Object pattern can't contain getter or setter");
-        this.toAssignable(prop.value, isBinding);
-      }
-      break;
+      case "ObjectExpression":
+        node.type = "ObjectPattern";
+        for (let prop of (node.properties: Array)) {
+          if (prop.type === "SpreadProperty") continue;
+          if (prop.kind !== "init") this.raise(prop.key.start, "Object pattern can't contain getter or setter");
+          this.toAssignable(prop.value, isBinding);
+        }
+        break;
 
-    case "ArrayExpression":
-      node.type = "ArrayPattern";
-      this.toAssignableList(node.elements, isBinding);
-      break;
+      case "ArrayExpression":
+        node.type = "ArrayPattern";
+        this.toAssignableList(node.elements, isBinding);
+        break;
 
-    case "AssignmentExpression":
-      if (node.operator === "=") {
-        node.type = "AssignmentPattern";
-        delete node.operator;
-      } else {
-        this.raise(node.left.end, "Only '=' operator can be used for specifying default value.");
-      }
-      break;
+      case "AssignmentExpression":
+        if (node.operator === "=") {
+          node.type = "AssignmentPattern";
+          delete node.operator;
+        } else {
+          this.raise(node.left.end, "Only '=' operator can be used for specifying default value.");
+        }
+        break;
 
-    case "MemberExpression":
-      if (!isBinding) break;
+      case "MemberExpression":
+        if (!isBinding) break;
 
-    default:
-      this.raise(node.start, "Assigning to rvalue");
+      default:
+        this.raise(node.start, "Assigning to rvalue");
     }
   }
   return node;
@@ -181,16 +180,14 @@ pp.checkLVal = function (expr, isBinding, checkClashes) {
     break;
 
   case "ObjectPattern":
-       for (let i = 0; i < expr.properties.length; i++) {
-      var prop = expr.properties[i];
+       for (let prop of (expr.properties: Array)) {
       if (prop.type === "Property") prop = prop.value;
       this.checkLVal(prop, isBinding, checkClashes);
     }
     break;
 
   case "ArrayPattern":
-    for (let i = 0; i < expr.elements.length; i++) {
-      let elem = expr.elements[i];
+    for (let elem of (expr.elements: Array)) {
       if (elem) this.checkLVal(elem, isBinding, checkClashes);
     }
     break;
diff --git a/src/node.js b/src/node.js
index 2ce99dfd94..52b3da6a6c 100755
--- a/src/node.js
+++ b/src/node.js
@@ -1,5 +1,5 @@
 import { Parser } from "./state";
-import { SourceLocation } from "./location";
+import { SourceLocation } from "./locutil";
 
 // Start an AST node, attaching a start offset.
 
@@ -12,13 +12,7 @@ export class Node {
     this.end = 0;
 
     if (parser) {
-      if (parser.options.locations) {
-        this.loc = new SourceLocation(loc);
-      }
-
-      if (parser.options.ranges) {
-        this.range = [pos, 0];
-      }
+      this.loc = new SourceLocation(loc);
     }
   }
 
@@ -40,8 +34,7 @@ pp.startNodeAt = function (pos, loc) {
 function finishNodeAt(node, type, pos, loc) {
   node.type = type;
   node.end = pos;
-  if (this.options.locations) node.loc.end = loc;
-  if (this.options.ranges) node.range[1] = pos;
+  node.loc.end = loc;
   this.processComment(node);
   return node;
 }
diff --git a/src/options.js b/src/options.js
index fbcb758db4..5c5d6d50f1 100755
--- a/src/options.js
+++ b/src/options.js
@@ -1,5 +1,3 @@
-import { has } from "./util";
-
 // A second optional argument can be given to further configure
 // the parser process. These options are recognized:
 
@@ -17,20 +15,6 @@ export const defaultOptions = {
   // When enabled, import/export statements are not constrained to
   // appearing at the top of the program.
   allowImportExportEverywhere: false,
-  // When `locations` is on, `loc` properties holding objects with
-  // `start` and `end` properties in `{line, column}` form (with
-  // line being 1-based and column 0-based) will be attached to the
-  // nodes.
-  locations: false,
-  // Nodes have their start and end characters offsets recorded in
-  // `start` and `end` properties (directly on the node, rather than
-  // the `loc` object, which holds line/column data. To also add a
-  // [semi-standardized][range] `range` property holding a `[start,
-  // end]` array with the same numbers, set the `ranges` option to
-  // `true`.
-  //
-  // [range]: https://bugzilla.mozilla.org/show_bug.cgi?id=745678
-  ranges: false,
   plugins: {},
   // Babel-specific options
   features: {},
@@ -41,8 +25,8 @@ export const defaultOptions = {
 
 export function getOptions(opts) {
   let options = {};
-  for (let opt in defaultOptions) {
-    options[opt] = opts && has(opts, opt) ? opts[opt] : defaultOptions[opt];
+  for (let key in defaultOptions) {
+    options[key] = opts && key in opts ? opts[key] : defaultOptions[key];
   }
   return options;
 }
diff --git a/src/parseutil.js b/src/parseutil.js
index bf848bf68c..1793d23614 100755
--- a/src/parseutil.js
+++ b/src/parseutil.js
@@ -1,6 +1,6 @@
-import { types as tt } from "./tokentype";
+import { types as tt } from "./tokenizer/types";
 import { Parser } from "./state";
-import { lineBreak } from "./whitespace";
+import { lineBreak } from "./util/whitespace";
 
 const pp = Parser.prototype;
 
diff --git a/src/plugins/flow.js b/src/plugins/flow.js
index 3db24cd886..461d0597b8 100644
--- a/src/plugins/flow.js
+++ b/src/plugins/flow.js
@@ -1,4 +1,4 @@
-import { types as tt } from "../tokentype";
+import { types as tt } from "../tokenizer/types";
 import { Parser } from "../state";
 
 var pp = Parser.prototype;
diff --git a/src/plugins/jsx/index.js b/src/plugins/jsx/index.js
index 3e3368f476..8aeaf9b2f9 100644
--- a/src/plugins/jsx/index.js
+++ b/src/plugins/jsx/index.js
@@ -1,9 +1,9 @@
 import XHTMLEntities from "./xhtml";
-import { TokenType, types as tt } from "../../tokentype";
-import { TokContext, types as tc } from "../../tokencontext";
+import { TokenType, types as tt } from "../../tokenizer/types";
+import { TokContext, types as tc } from "../../tokenizer/context";
 import { Parser } from "../../state";
-import { isIdentifierChar, isIdentifierStart } from "../../identifier";
-import { isNewLine } from "../../whitespace";
+import { isIdentifierChar, isIdentifierStart } from "../../util/identifier";
+import { isNewLine } from "../../util/whitespace";
 
 const HEX_NUMBER = /^[\da-fA-F]+$/;
 const DECIMAL_NUMBER = /^\d+$/;
@@ -87,10 +87,8 @@ pp.jsxReadNewLine = function(normalizeCRLF) {
   } else {
     out = String.fromCharCode(ch);
   }
-  if (this.options.locations) {
-    ++this.curLine;
-    this.lineStart = this.pos;
-  }
+  ++this.curLine;
+  this.lineStart = this.pos;
 
   return out;
 };
diff --git a/src/state.js b/src/state.js
index fc47b6b78f..c5c503afaa 100755
--- a/src/state.js
+++ b/src/state.js
@@ -1,98 +1,69 @@
-import { reservedWords, keywords } from "./identifier";
-import { types as tt } from "./tokentype";
-import { lineBreak } from "./whitespace";
-
-export function Parser(options, input, startPos) {
-  this.options = options;
-  this.isKeyword = keywords[6];
-  this.isReservedWord = reservedWords[6];
-  this.input = input;
-  this.loadPlugins(this.options.plugins);
-
-  // Set up token state
-
-  // The current position of the tokenizer in the input.
-  if (startPos) {
-    this.pos = startPos;
-    this.lineStart = Math.max(0, this.input.lastIndexOf("\n", startPos));
-    this.curLine = this.input.slice(0, this.lineStart).split(lineBreak).length;
-  } else {
-    this.pos = this.lineStart = 0;
-    this.curLine = 1;
-  }
-
-  // Properties of the current token:
-  // Its type
-  this.type = tt.eof;
-  // For tokens that include more information than their type, the value
-  this.value = null;
-  // Its start and end offset
-  this.start = this.end = this.pos;
-  // And, if locations are used, the {line, column} object
-  // corresponding to those offsets
-  this.startLoc = this.endLoc = this.curPosition();
-
-  // Position information for the previous token
-  this.lastTokEndLoc = this.lastTokStartLoc = null;
-  this.lastTokStart = this.lastTokEnd = this.pos;
-
-  // The context stack is used to superficially track syntactic
-  // context to predict whether a regular expression is allowed in a
-  // given position.
-  this.context = this.initialContext();
-  this.exprAllowed = true;
-
-  // Figure out if it's a module code.
-  this.inModule = this.options.sourceType === "module";
-  this.strict = this.options.strictMode === false ? false : this.inModule;
-
-  // Used to signify the start of a potential arrow function
-  this.potentialArrowAt = -1;
-
-  // Flags to track whether we are in a function, a generator.
-  this.inFunction = this.inGenerator = false;
-  // Labels in scope.
-  this.labels = [];
-
-  // Leading decorators.
-  this.decorators = [];
-
-  // Token store.
-  this.tokens = [];
-
-  // Comment store.
-  this.comments = [];
-
-  // Comment attachment store
-  this.trailingComments = [];
-  this.leadingComments = [];
-  this.bottomRightStack = [];
-
-  // If enabled, skip leading hashbang line.
-  if (this.pos === 0 && this.input[0] === "#" && this.input[1] === "!") {
-    this.skipLineComment(2);
-  }
-}
-
-Parser.prototype.extend = function (name, f) {
-  this[name] = f(this[name]);
-};
+import { reservedWords, isKeyword } from "./util/identifier";
+import { getOptions } from "./options";
+import Tokenizer from "./tokenizer";
 
 // Registered plugins
 
 export const plugins = {};
 
-Parser.prototype.loadPlugins = function (plugins) {
-  for (let name in plugins) {
-    let plugin = exports.plugins[name];
-    if (!plugin) throw new Error(`Plugin '${name}' not found`);
-    plugin(this, plugins[name]);
-  }
-};
+export class Parser extends Tokenizer {
+  constructor(options, input) {
+    super();
 
-Parser.prototype.parse = function () {
-  let file = this.startNode();
-  let program = this.startNode();
-  this.nextToken();
-  return this.parseTopLevel(file, program);
-};
+    this.options = getOptions(options);
+    this.isKeyword = isKeyword;
+    this.isReservedWord = reservedWords[6];
+    this.input = input;
+    this.loadPlugins(this.options.plugins);
+
+    // Figure out if it's a module code.
+    this.inModule = this.options.sourceType === "module";
+    this.strict = this.options.strictMode === false ? false : this.inModule;
+
+    // Used to signify the start of a potential arrow function
+    this.potentialArrowAt = -1;
+
+    // Flags to track whether we are in a function, a generator.
+    this.inFunction = this.inGenerator = false;
+    // Labels in scope.
+    this.labels = [];
+
+    // Leading decorators.
+    this.decorators = [];
+
+    // Token store.
+    this.tokens = [];
+
+    // Comment store.
+    this.comments = [];
+
+    // Comment attachment store
+    this.trailingComments = [];
+    this.leadingComments = [];
+    this.bottomRightStack = [];
+
+    // If enabled, skip leading hashbang line.
+    if (this.pos === 0 && this.input[0] === "#" && this.input[1] === "!") {
+      this.skipLineComment(2);
+    }
+  }
+
+  extend(name, f) {
+    this[name] = f(this[name]);
+  }
+
+  loadPlugins(plugins) {
+    for (let name in plugins) {
+      let plugin = exports.plugins[name];
+      if (!plugin) throw new Error(`Plugin '${name}' not found`);
+      plugin(this, plugins[name]);
+    }
+  }
+
+  parse() {
+    let file = this.startNode();
+    let program = this.startNode();
+    this.nextToken();
+    return this.parseTopLevel(file, program);
+  }
+}
diff --git a/src/statement.js b/src/statement.js
index 4856eb2a85..3e0795830e 100755
--- a/src/statement.js
+++ b/src/statement.js
@@ -1,6 +1,6 @@
-import { types as tt } from "./tokentype";
+import { types as tt } from "./tokenizer/types";
 import { Parser } from "./state";
-import { lineBreak } from "./whitespace";
+import { lineBreak } from "./util/whitespace";
 
 const pp = Parser.prototype;
 
@@ -368,8 +368,8 @@ pp.parseEmptyStatement = function (node) {
 };
 
 pp.parseLabeledStatement = function (node, maybeName, expr) {
-  for (let i = 0; i < this.labels.length; ++i){
-    if (this.labels[i].name === maybeName) {
+  for (let label of (this.labels: Array)){
+    if (label.name === maybeName) {
       this.raise(expr.start, `Label '${maybeName}' is already declared`);
     }
   }
diff --git a/src/tokenize.js b/src/tokenize.js
deleted file mode 100755
index cd85e99259..0000000000
--- a/src/tokenize.js
+++ /dev/null
@@ -1,746 +0,0 @@
-import { isIdentifierStart, isIdentifierChar } from "./identifier";
-import { types as tt, keywords as keywordTypes } from "./tokentype";
-import { Parser } from "./state";
-import { SourceLocation } from "./location";
-import { lineBreak, lineBreakG, isNewLine, nonASCIIwhitespace } from "./whitespace";
-
-// Object type used to represent tokens. Note that normally, tokens
-// simply exist as properties on the parser object. This is only
-// used for the onToken callback and the external tokenizer.
-
-export class Token {
-  constructor(p) {
-    this.type = p.type;
-    this.value = p.value;
-    this.start = p.start;
-    this.end = p.end;
-
-    if (p.options.locations) {
-      this.loc = new SourceLocation(p.startLoc, p.endLoc);
-    }
-
-    if (p.options.ranges) {
-      this.range = [p.start, p.end];
-    }
-  }
-}
-
-// ## Tokenizer
-
-const pp = Parser.prototype;
-
-// Are we running under Rhino?
-/* global Packages */
-const isRhino = typeof Packages === "object" && Object.prototype.toString.call(Packages) === "[object JavaPackage]";
-
-// Move to the next token
-
-pp.next = function () {
-  if (!this.isLookahead)
-    this.tokens.push(new Token(this));
-
-  this.lastTokEnd = this.end;
-  this.lastTokStart = this.start;
-  this.lastTokEndLoc = this.endLoc;
-  this.lastTokStartLoc = this.startLoc;
-  this.nextToken();
-};
-
-pp.getToken = function () {
-  this.next();
-  return new Token(this);
-};
-
-// Toggle strict mode. Re-reads the next number or string to please
-// pedantic tests (`"use strict"; 010;` should fail).
-
-pp.setStrict = function (strict) {
-  this.strict = strict;
-  if (this.type !== tt.num && this.type !== tt.string) return;
-  this.pos = this.start;
-  if (this.options.locations) {
-    while (this.pos < this.lineStart) {
-      this.lineStart = this.input.lastIndexOf("\n", this.lineStart - 2) + 1;
-      --this.curLine;
-    }
-  }
-  this.nextToken();
-};
-
-pp.curContext = function () {
-  return this.context[this.context.length - 1];
-};
-
-// Read a single token, updating the parser object's token-related
-// properties.
-
-pp.nextToken = function () {
-  let curContext = this.curContext();
-  if (!curContext || !curContext.preserveSpace) this.skipSpace();
-
-  this.start = this.pos;
-  if (this.options.locations) this.startLoc = this.curPosition();
-  if (this.pos >= this.input.length) return this.finishToken(tt.eof);
-
-  if (curContext.override) {
-    return curContext.override(this);
-  } else {
-    return this.readToken(this.fullCharCodeAtPos());
-  }
-};
-
-pp.readToken = function (code) {
-  // Identifier or keyword. '\uXXXX' sequences are allowed in
-  // identifiers, so '\' also dispatches to that.
-  if (isIdentifierStart(code, true) || code === 92 /* '\' */)
-    return this.readWord();
-
-  return this.getTokenFromCode(code);
-};
-
-pp.fullCharCodeAtPos = function () {
-  let code = this.input.charCodeAt(this.pos);
-  if (code <= 0xd7ff || code >= 0xe000) return code;
-
-  let next = this.input.charCodeAt(this.pos + 1);
-  return (code << 10) + next - 0x35fdc00;
-};
-
-function pushComment(block, text, start, end, startLoc, endLoc) {
-  var comment = {
-    type: block ? "CommentBlock" : "CommentLine",
-    value: text,
-    start: start,
-    end: end,
-    loc: new SourceLocation(startLoc, endLoc),
-    range: [start, end]
-  };
-
-  this.tokens.push(comment);
-  this.comments.push(comment);
-  this.addComment(comment);
-}
-
-pp.skipBlockComment = function () {
-  let startLoc = this.curPosition();
-  let start = this.pos, end = this.input.indexOf("*/", this.pos += 2);
-  if (end === -1) this.raise(this.pos - 2, "Unterminated comment");
-
-  this.pos = end + 2;
-  if (this.options.locations) {
-    lineBreakG.lastIndex = start;
-    let match;
-    while ((match = lineBreakG.exec(this.input)) && match.index < this.pos) {
-      ++this.curLine;
-      this.lineStart = match.index + match[0].length;
-    }
-  }
-
-  pushComment.call(this, true, this.input.slice(start + 2, end), start, this.pos, startLoc, this.curPosition());
-};
-
-pp.skipLineComment = function (startSkip) {
-  let start = this.pos;
-  let startLoc = this.curPosition();
-  let ch = this.input.charCodeAt(this.pos += startSkip);
-  while (this.pos < this.input.length && ch !== 10 && ch !== 13 && ch !== 8232 && ch !== 8233) {
-    ++this.pos;
-    ch = this.input.charCodeAt(this.pos);
-  }
-
-  pushComment.call(this, false, this.input.slice(start + startSkip, this.pos), start, this.pos, startLoc, this.curPosition());
-};
-
-// Called at the start of the parse and after every token. Skips
-// whitespace and comments, and.
-
-pp.skipSpace = function() {
-  loop: while (this.pos < this.input.length) {
-    let ch = this.input.charCodeAt(this.pos);
-    switch (ch) {
-      case 32: case 160: // ' '
-        ++this.pos;
-        break;
-
-      case 13:
-        if (this.input.charCodeAt(this.pos + 1) === 10) {
-          ++this.pos;
-        }
-
-      case 10: case 8232: case 8233:
-        ++this.pos;
-        if (this.options.locations) {
-          ++this.curLine;
-          this.lineStart = this.pos;
-        }
-        break;
-
-      case 47: // '/'
-        switch (this.input.charCodeAt(this.pos + 1)) {
-          case 42: // '*'
-            this.skipBlockComment();
-            break;
-
-          case 47:
-            this.skipLineComment(2);
-            break;
-
-          default:
-            break loop;
-        }
-        break;
-
-      default:
-        if (ch > 8 && ch < 14 || ch >= 5760 && nonASCIIwhitespace.test(String.fromCharCode(ch))) {
-          ++this.pos;
-        } else {
-          break loop;
-        }
-    }
-  }
-};
-
-// Called at the end of every token. Sets `end`, `val`, and
-// maintains `context` and `exprAllowed`, and skips the space after
-// the token, so that the next one's `start` will point at the
-// right position.
-
-pp.finishToken = function (type, val) {
-  this.end = this.pos;
-  if (this.options.locations) this.endLoc = this.curPosition();
-  let prevType = this.type;
-  this.type = type;
-  this.value = val;
-
-  this.updateContext(prevType);
-};
-
-// ### Token reading
-
-// This is the function that is called to fetch the next token. It
-// is somewhat obscure, because it works in character codes rather
-// than characters, and because operator parsing has been inlined
-// into it.
-//
-// All in the name of speed.
-//
-pp.readToken_dot = function () {
-  let next = this.input.charCodeAt(this.pos + 1);
-  if (next >= 48 && next <= 57) return this.readNumber(true);
-
-  let next2 = this.input.charCodeAt(this.pos + 2);
-  if (next === 46 && next2 === 46) { // 46 = dot '.'
-    this.pos += 3;
-    return this.finishToken(tt.ellipsis);
-  } else {
-    ++this.pos;
-    return this.finishToken(tt.dot);
-  }
-};
-
-pp.readToken_slash = function () { // '/'
-  let next = this.input.charCodeAt(this.pos + 1);
-  if (this.exprAllowed) {
-    ++this.pos;
-    return this.readRegexp();
-  }
-  if (next === 61) return this.finishOp(tt.assign, 2);
-  return this.finishOp(tt.slash, 1);
-};
-
-pp.readToken_mult_modulo = function (code) { // '%*'
-  var type = code === 42 ? tt.star : tt.modulo;
-  var width = 1;
-  var next = this.input.charCodeAt(this.pos + 1);
-
-  if (next === 42 && this.options.features["es7.exponentiationOperator"]) { // '*'
-    width++;
-    next = this.input.charCodeAt(this.pos + 2);
-    type = tt.exponent;
-  }
-
-  if (next === 61) {
-    width++;
-    type = tt.assign;
-  }
-
-  return this.finishOp(type, width);
-};
-
-pp.readToken_pipe_amp = function (code) { // '|&'
-  let next = this.input.charCodeAt(this.pos + 1);
-  if (next === code) return this.finishOp(code === 124 ? tt.logicalOR : tt.logicalAND, 2);
-  if (next === 61) return this.finishOp(tt.assign, 2);
-  return this.finishOp(code === 124 ? tt.bitwiseOR : tt.bitwiseAND, 1);
-};
-
-pp.readToken_caret = function () { // '^'
-  let next = this.input.charCodeAt(this.pos + 1);
-  if (next === 61) {
-    return this.finishOp(tt.assign, 2);
-  } else {
-    return this.finishOp(tt.bitwiseXOR, 1);
-  }
-};
-
-pp.readToken_plus_min = function (code) { // '+-'
-  let next = this.input.charCodeAt(this.pos + 1);
-
-  if (next === code) {
-    if (next === 45 && this.input.charCodeAt(this.pos + 2) === 62 && lineBreak.test(this.input.slice(this.lastTokEnd, this.pos))) {
-      // A `-->` line comment
-      this.skipLineComment(3);
-      this.skipSpace();
-      return this.nextToken();
-    }
-    return this.finishOp(tt.incDec, 2);
-  }
-
-  if (next === 61) {
-    return this.finishOp(tt.assign, 2);
-  } else {
-    return this.finishOp(tt.plusMin, 1);
-  }
-};
-
-pp.readToken_lt_gt = function (code) { // '<>'
-  let next = this.input.charCodeAt(this.pos + 1);
-  let size = 1;
-
-  if (next === code) {
-    size = code === 62 && this.input.charCodeAt(this.pos + 2) === 62 ? 3 : 2;
-    if (this.input.charCodeAt(this.pos + size) === 61) return this.finishOp(tt.assign, size + 1);
-    return this.finishOp(tt.bitShift, size);
-  }
-
-  if (next === 33 && code === 60 && this.input.charCodeAt(this.pos + 2) === 45 && this.input.charCodeAt(this.pos + 3) === 45) {
-    if (this.inModule) this.unexpected();
-    // `<!--`, an XML-style comment that should be interpreted as a line comment
-    this.skipLineComment(4);
-    this.skipSpace();
-    return this.nextToken();
-  }
-
-  if (next === 61) {
-    size = this.input.charCodeAt(this.pos + 2) === 61 ? 3 : 2;
-  }
-
-  return this.finishOp(tt.relational, size);
-};
-
-pp.readToken_eq_excl = function (code) { // '=!'
-  let next = this.input.charCodeAt(this.pos + 1);
-  if (next === 61) return this.finishOp(tt.equality, this.input.charCodeAt(this.pos + 2) === 61 ? 3 : 2);
-  if (code === 61 && next === 62) { // '=>'
-    this.pos += 2;
-    return this.finishToken(tt.arrow);
-  }
-  return this.finishOp(code === 61 ? tt.eq : tt.prefix, 1);
-};
-
-pp.getTokenFromCode = function (code) {
-  switch (code) {
-    // The interpretation of a dot depends on whether it is followed
-    // by a digit or another two dots.
-  case 46: // '.'
-    return this.readToken_dot();
-
-    // Punctuation tokens.
-  case 40: ++this.pos; return this.finishToken(tt.parenL);
-  case 41: ++this.pos; return this.finishToken(tt.parenR);
-  case 59: ++this.pos; return this.finishToken(tt.semi);
-  case 44: ++this.pos; return this.finishToken(tt.comma);
-  case 91: ++this.pos; return this.finishToken(tt.bracketL);
-  case 93: ++this.pos; return this.finishToken(tt.bracketR);
-  case 123: ++this.pos; return this.finishToken(tt.braceL);
-  case 125: ++this.pos; return this.finishToken(tt.braceR);
-
-  case 58:
-    if (this.options.features["es7.functionBind"] && this.input.charCodeAt(this.pos + 1) === 58) {
-      return this.finishOp(tt.doubleColon, 2);
-    } else {
-      ++this.pos;
-      return this.finishToken(tt.colon);
-    }
-
-  case 63: ++this.pos; return this.finishToken(tt.question);
-  case 64: ++this.pos; return this.finishToken(tt.at);
-
-  case 96: // '`'
-    ++this.pos;
-    return this.finishToken(tt.backQuote);
-
-  case 48: // '0'
-    let next = this.input.charCodeAt(this.pos + 1);
-    if (next === 120 || next === 88) return this.readRadixNumber(16); // '0x', '0X' - hex number
-    if (next === 111 || next === 79) return this.readRadixNumber(8); // '0o', '0O' - octal number
-    if (next === 98 || next === 66) return this.readRadixNumber(2); // '0b', '0B' - binary number
-    // Anything else beginning with a digit is an integer, octal
-    // number, or float.
-  case 49: case 50: case 51: case 52: case 53: case 54: case 55: case 56: case 57: // 1-9
-    return this.readNumber(false);
-
-    // Quotes produce strings.
-  case 34: case 39: // '"', "'"
-    return this.readString(code);
-
-    // Operators are parsed inline in tiny state machines. '=' (61) is
-    // often referred to. `finishOp` simply skips the amount of
-    // characters it is given as second argument, and returns a token
-    // of the type given by its first argument.
-
-  case 47: // '/'
-    return this.readToken_slash();
-
-  case 37: case 42: // '%*'
-    return this.readToken_mult_modulo(code);
-
-  case 124: case 38: // '|&'
-    return this.readToken_pipe_amp(code);
-
-  case 94: // '^'
-    return this.readToken_caret();
-
-  case 43: case 45: // '+-'
-    return this.readToken_plus_min(code);
-
-  case 60: case 62: // '<>'
-    return this.readToken_lt_gt(code);
-
-  case 61: case 33: // '=!'
-    return this.readToken_eq_excl(code);
-
-  case 126: // '~'
-    return this.finishOp(tt.prefix, 1);
-  }
-
-  this.raise(this.pos, `Unexpected character '${codePointToString(code)}'`);
-};
-
-pp.finishOp = function (type, size) {
-  let str = this.input.slice(this.pos, this.pos + size);
-  this.pos += size;
-  return this.finishToken(type, str);
-};
-
-// Parse a regular expression. Some context-awareness is necessary,
-// since a '/' inside a '[]' set does not end the expression.
-
-function tryCreateRegexp(src, flags, throwErrorStart) {
-  try {
-    return new RegExp(src, flags);
-  } catch (e) {
-    if (throwErrorStart !== undefined) {
-      if (e instanceof SyntaxError) this.raise(throwErrorStart, "Error parsing regular expression: " + e.message);
-      this.raise(e);
-    }
-  }
-}
-
-var regexpUnicodeSupport = !!tryCreateRegexp("\uffff", "u");
-
-pp.readRegexp = function() {
-  let escaped, inClass, start = this.pos;
-  for (;;) {
-    if (this.pos >= this.input.length) this.raise(start, "Unterminated regular expression");
-    let ch = this.input.charAt(this.pos);
-    if (lineBreak.test(ch)) this.raise(start, "Unterminated regular expression");
-    if (escaped) {
-      escaped = false;
-    } else {
-      if (ch === "[") inClass = true;
-      else if (ch === "]" && inClass) inClass = false;
-      else if (ch === "/" && !inClass) break;
-      escaped = ch === "\\";
-    }
-    ++this.pos;
-  }
-  let content = this.input.slice(start, this.pos);
-  ++this.pos;
-  // Need to use `readWord1` because '\uXXXX' sequences are allowed
-  // here (don't ask).
-  let mods = this.readWord1();
-  let tmp = content;
-  if (mods) {
-    let validFlags = /^[gmsiyu]*$/;
-    if (!validFlags.test(mods)) this.raise(start, "Invalid regular expression flag");
-    if (mods.indexOf("u") >= 0 && !regexpUnicodeSupport) {
-      // Replace each astral symbol and every Unicode escape sequence that
-      // possibly represents an astral symbol or a paired surrogate with a
-      // single ASCII symbol to avoid throwing on regular expressions that
-      // are only valid in combination with the `/u` flag.
-      // Note: replacing with the ASCII symbol `x` might cause false
-      // negatives in unlikely scenarios. For example, `[\u{61}-b]` is a
-      // perfectly valid pattern that is equivalent to `[a-b]`, but it would
-      // be replaced by `[x-b]` which throws an error.
-      tmp = tmp.replace(/\\u\{([0-9a-fA-F]+)\}/g, (match, code, offset) => {
-        code = Number("0x" + code);
-        if (code > 0x10FFFF) this.raise(start + offset + 3, "Code point out of bounds");
-        return "x";
-      });
-      tmp = tmp.replace(/\\u([a-fA-F0-9]{4})|[\uD800-\uDBFF][\uDC00-\uDFFF]/g, "x");
-    }
-  }
-  // Detect invalid regular expressions.
-  let value = null;
-  // Rhino's regular expression parser is flaky and throws uncatchable exceptions,
-  // so don't do detection if we are running under Rhino
-  if (!isRhino) {
-    tryCreateRegexp.call(this, tmp, undefined, start);
-    // Get a regular expression object for this pattern-flag pair, or `null` in
-    // case the current environment doesn't support the flags it uses.
-    value = tryCreateRegexp.call(this, content, mods);
-  }
-  return this.finishToken(tt.regexp, {pattern: content, flags: mods, value: value});
-};
-
-// Read an integer in the given radix. Return null if zero digits
-// were read, the integer value otherwise. When `len` is given, this
-// will return `null` unless the integer has exactly `len` digits.
-
-pp.readInt = function (radix, len) {
-  let start = this.pos, total = 0;
-  for (let i = 0, e = len == null ? Infinity : len; i < e; ++i) {
-    let code = this.input.charCodeAt(this.pos), val;
-    if (code >= 97) val = code - 97 + 10; // a
-    else if (code >= 65) val = code - 65 + 10; // A
-    else if (code >= 48 && code <= 57) val = code - 48; // 0-9
-    else val = Infinity;
-    if (val >= radix) break;
-    ++this.pos;
-    total = total * radix + val;
-  }
-  if (this.pos === start || len != null && this.pos - start !== len) return null;
-
-  return total;
-};
-
-pp.readRadixNumber = function (radix) {
-  this.pos += 2; // 0x
-  let val = this.readInt(radix);
-  if (val == null) this.raise(this.start + 2, "Expected number in radix " + radix);
-  if (isIdentifierStart(this.fullCharCodeAtPos())) this.raise(this.pos, "Identifier directly after number");
-  return this.finishToken(tt.num, val);
-};
-
-// Read an integer, octal integer, or floating-point number.
-
-pp.readNumber = function (startsWithDot) {
-  let start = this.pos, isFloat = false, octal = this.input.charCodeAt(this.pos) === 48;
-  if (!startsWithDot && this.readInt(10) === null) this.raise(start, "Invalid number");
-  let next = this.input.charCodeAt(this.pos);
-  if (next === 46) { // '.'
-    ++this.pos;
-    this.readInt(10);
-    isFloat = true;
-    next = this.input.charCodeAt(this.pos);
-  }
-  if (next === 69 || next === 101) { // 'eE'
-    next = this.input.charCodeAt(++this.pos);
-    if (next === 43 || next === 45) ++this.pos; // '+-'
-    if (this.readInt(10) === null) this.raise(start, "Invalid number");
-    isFloat = true;
-  }
-  if (isIdentifierStart(this.fullCharCodeAtPos())) this.raise(this.pos, "Identifier directly after number");
-
-  let str = this.input.slice(start, this.pos), val;
-  if (isFloat) val = parseFloat(str);
-  else if (!octal || str.length === 1) val = parseInt(str, 10);
-  else if (/[89]/.test(str) || this.strict) this.raise(start, "Invalid number");
-  else val = parseInt(str, 8);
-  return this.finishToken(tt.num, val);
-};
-
-// Read a string value, interpreting backslash-escapes.
-
-pp.readCodePoint = function () {
-  let ch = this.input.charCodeAt(this.pos), code;
-
-  if (ch === 123) {
-    let codePos = ++this.pos;
-    code = this.readHexChar(this.input.indexOf("}", this.pos) - this.pos);
-    ++this.pos;
-    if (code > 0x10FFFF) this.raise(codePos, "Code point out of bounds");
-  } else {
-    code = this.readHexChar(4);
-  }
-  return code;
-};
-
-function codePointToString(code) {
-  // UTF-16 Decoding
-  if (code <= 0xFFFF) return String.fromCharCode(code);
-  return String.fromCharCode(((code - 0x10000) >> 10) + 0xD800,
-                             ((code - 0x10000) & 1023) + 0xDC00);
-}
-
-pp.readString = function (quote) {
-  let out = "", chunkStart = ++this.pos;
-  for (;;) {
-    if (this.pos >= this.input.length) this.raise(this.start, "Unterminated string constant");
-    let ch = this.input.charCodeAt(this.pos);
-    if (ch === quote) break;
-    if (ch === 92) { // '\'
-      out += this.input.slice(chunkStart, this.pos);
-      out += this.readEscapedChar(false);
-      chunkStart = this.pos;
-    } else {
-      if (isNewLine(ch)) this.raise(this.start, "Unterminated string constant");
-      ++this.pos;
-    }
-  }
-  out += this.input.slice(chunkStart, this.pos++);
-  return this.finishToken(tt.string, out);
-};
-
-// Reads template string tokens.
-
-pp.readTmplToken = function () {
-  let out = "", chunkStart = this.pos;
-  for (;;) {
-    if (this.pos >= this.input.length) this.raise(this.start, "Unterminated template");
-    let ch = this.input.charCodeAt(this.pos);
-    if (ch === 96 || ch === 36 && this.input.charCodeAt(this.pos + 1) === 123) { // '`', '${'
-      if (this.pos === this.start && this.type === tt.template) {
-        if (ch === 36) {
-          this.pos += 2;
-          return this.finishToken(tt.dollarBraceL);
-        } else {
-          ++this.pos;
-          return this.finishToken(tt.backQuote);
-        }
-      }
-      out += this.input.slice(chunkStart, this.pos);
-      return this.finishToken(tt.template, out);
-    }
-    if (ch === 92) { // '\'
-      out += this.input.slice(chunkStart, this.pos);
-      out += this.readEscapedChar(true);
-      chunkStart = this.pos;
-    } else if (isNewLine(ch)) {
-      out += this.input.slice(chunkStart, this.pos);
-      ++this.pos;
-      switch (ch) {
-        case 13:
-          if (this.input.charCodeAt(this.pos) === 10) ++this.pos;
-        case 10:
-          out += "\n";
-          break;
-        default:
-          out += String.fromCharCode(ch);
-          break;
-      }
-      if (this.options.locations) {
-        ++this.curLine;
-        this.lineStart = this.pos;
-      }
-      chunkStart = this.pos;
-    } else {
-      ++this.pos;
-    }
-  }
-};
-
-// Used to read escaped characters
-
-pp.readEscapedChar = function (inTemplate) {
-  let ch = this.input.charCodeAt(++this.pos);
-  ++this.pos;
-  switch (ch) {
-  case 110: return "\n"; // 'n' -> '\n'
-  case 114: return "\r"; // 'r' -> '\r'
-  case 120: return String.fromCharCode(this.readHexChar(2)); // 'x'
-  case 117: return codePointToString(this.readCodePoint()); // 'u'
-  case 116: return "\t"; // 't' -> '\t'
-  case 98: return "\b"; // 'b' -> '\b'
-  case 118: return "\u000b"; // 'v' -> '\u000b'
-  case 102: return "\f"; // 'f' -> '\f'
-  case 13: if (this.input.charCodeAt(this.pos) === 10) ++this.pos; // '\r\n'
-  case 10: // ' \n'
-    if (this.options.locations) {
-      this.lineStart = this.pos;
-      ++this.curLine;
-    }
-    return "";
-  default:
-    if (ch >= 48 && ch <= 55) {
-      let octalStr = this.input.substr(this.pos - 1, 3).match(/^[0-7]+/)[0];
-      let octal = parseInt(octalStr, 8);
-      if (octal > 255) {
-        octalStr = octalStr.slice(0, -1);
-        octal = parseInt(octalStr, 8);
-      }
-      if (octal > 0 && (this.strict || inTemplate)) {
-        this.raise(this.pos - 2, "Octal literal in strict mode");
-      }
-      this.pos += octalStr.length - 1;
-      return String.fromCharCode(octal);
-    }
-    return String.fromCharCode(ch);
-  }
-};
-
-// Used to read character escape sequences ('\x', '\u', '\U').
-
-pp.readHexChar = function (len) {
-  let codePos = this.pos;
-  let n = this.readInt(16, len);
-  if (n === null) this.raise(codePos, "Bad character escape sequence");
-  return n;
-};
-
-// Used to signal to callers of `readWord1` whether the word
-// contained any escape sequences. This is needed because words with
-// escape sequences must not be interpreted as keywords.
-
-var containsEsc;
-
-// Read an identifier, and return it as a string. Sets `containsEsc`
-// to whether the word contained a '\u' escape.
-//
-// Incrementally adds only escaped chars, adding other chunks as-is
-// as a micro-optimization.
-
-pp.readWord1 = function () {
-  containsEsc = false;
-  let word = "", first = true, chunkStart = this.pos;
-  while (this.pos < this.input.length) {
-    let ch = this.fullCharCodeAtPos();
-    if (isIdentifierChar(ch, true)) {
-      this.pos += ch <= 0xffff ? 1 : 2;
-    } else if (ch === 92) { // "\"
-      containsEsc = true;
-
-      word += this.input.slice(chunkStart, this.pos);
-      let escStart = this.pos;
-
-      if (this.input.charCodeAt(++this.pos) !== 117) { // "u"
-        this.raise(this.pos, "Expecting Unicode escape sequence \\uXXXX");
-      }
-
-      ++this.pos;
-      let esc = this.readCodePoint();
-      if (!(first ? isIdentifierStart : isIdentifierChar)(esc, true)) {
-        this.raise(escStart, "Invalid Unicode escape");
-      }
-
-      word += codePointToString(esc);
-      chunkStart = this.pos;
-    } else {
-      break;
-    }
-    first = false;
-  }
-  return word + this.input.slice(chunkStart, this.pos);
-};
-
-// Read an identifier or keyword token. Will check for reserved
-// words when necessary.
-
-pp.readWord = function () {
-  let word = this.readWord1();
-  let type = tt.name;
-  if (!containsEsc && this.isKeyword(word))
-    type = keywordTypes[word];
-  return this.finishToken(type, word);
-};
diff --git a/src/tokencontext.js b/src/tokenizer/context.js
old mode 100755
new mode 100644
similarity index 96%
rename from src/tokencontext.js
rename to src/tokenizer/context.js
index 16853534ad..d0e0cbab27
--- a/src/tokencontext.js
+++ b/src/tokenizer/context.js
@@ -2,9 +2,9 @@
 // given point in the program is loosely based on sweet.js' approach.
 // See https://github.com/mozilla/sweet.js/wiki/design
 
-import { Parser } from "./state";
-import { types as tt } from "./tokentype";
-import { lineBreak } from "./whitespace";
+import { Parser } from "../state";
+import { types as tt } from "./types";
+import { lineBreak } from "../util/whitespace";
 
 export class TokContext {
   constructor(token, isExpr, preserveSpace, override) {
diff --git a/src/tokenizer/index.js b/src/tokenizer/index.js
new file mode 100644
index 0000000000..f84aa7954b
--- /dev/null
+++ b/src/tokenizer/index.js
@@ -0,0 +1,756 @@
+import { isIdentifierStart, isIdentifierChar } from "../util/identifier";
+import { types as tt, keywords as keywordTypes } from "./types";
+import { SourceLocation } from "../locutil";
+import { lineBreak, lineBreakG, isNewLine, nonASCIIwhitespace } from "../util/whitespace";
+
+// Object type used to represent tokens. Note that normally, tokens
+// simply exist as properties on the parser object. This is only
+// used for the onToken callback and the external tokenizer.
+
+export class Token {
+  constructor(p) {
+    this.type = p.type;
+    this.value = p.value;
+    this.start = p.start;
+    this.end = p.end;
+
+    this.loc = new SourceLocation(p.startLoc, p.endLoc);
+  }
+}
+
+// ## Tokenizer
+
+// Are we running under Rhino?
+/* global Packages */
+const isRhino = typeof Packages === "object" && Object.prototype.toString.call(Packages) === "[object JavaPackage]";
+
+// Parse a regular expression. Some context-awareness is necessary,
+// since a '/' inside a '[]' set does not end the expression.
+
+function tryCreateRegexp(src, flags, throwErrorStart) {
+  try {
+    return new RegExp(src, flags);
+  } catch (e) {
+    if (throwErrorStart !== undefined) {
+      if (e instanceof SyntaxError) this.raise(throwErrorStart, "Error parsing regular expression: " + e.message);
+      this.raise(e);
+    }
+  }
+}
+
+var regexpUnicodeSupport = !!tryCreateRegexp("\uffff", "u");
+
+function codePointToString(code) {
+  // UTF-16 Decoding
+  if (code <= 0xFFFF) return String.fromCharCode(code);
+  return String.fromCharCode(((code - 0x10000) >> 10) + 0xD800, ((code - 0x10000) & 1023) + 0xDC00);
+}
+
+// Used to signal to callers of `readWord1` whether the word
+// contained any escape sequences. This is needed because words with
+// escape sequences must not be interpreted as keywords.
+
+var containsEsc;
+
+export default class Tokenizer {
+  constructor() {
+    // The current position of the tokenizer in the input.
+    this.pos = this.lineStart = 0;
+    this.curLine = 1;
+
+    // Properties of the current token:
+    // Its type
+    this.type = tt.eof;
+    // For tokens that include more information than their type, the value
+    this.value = null;
+    // Its start and end offset
+    this.start = this.end = this.pos;
+    // And, if locations are used, the {line, column} object
+    // corresponding to those offsets
+    this.startLoc = this.endLoc = this.curPosition();
+
+    // Position information for the previous token
+    this.lastTokEndLoc = this.lastTokStartLoc = null;
+    this.lastTokStart = this.lastTokEnd = this.pos;
+
+    // The context stack is used to superficially track syntactic
+    // context to predict whether a regular expression is allowed in a
+    // given position.
+    this.context = this.initialContext();
+    this.exprAllowed = true;
+  }
+
+  // Move to the next token
+
+  next() {
+    if (!this.isLookahead) {
+      this.tokens.push(new Token(this));
+    }
+
+    this.lastTokEnd = this.end;
+    this.lastTokStart = this.start;
+    this.lastTokEndLoc = this.endLoc;
+    this.lastTokStartLoc = this.startLoc;
+    this.nextToken();
+  };
+
+  getToken() {
+    this.next();
+    return new Token(this);
+  }
+
+  // Toggle strict mode. Re-reads the next number or string to please
+  // pedantic tests (`"use strict"; 010;` should fail).
+
+  setStrict(strict) {
+    this.strict = strict;
+    if (this.type !== tt.num && this.type !== tt.string) return;
+    this.pos = this.start;
+    while (this.pos < this.lineStart) {
+      this.lineStart = this.input.lastIndexOf("\n", this.lineStart - 2) + 1;
+      --this.curLine;
+    }
+    this.nextToken();
+  }
+
+  curContext() {
+    return this.context[this.context.length - 1];
+  }
+
+  // Read a single token, updating the parser object's token-related
+  // properties.
+
+  nextToken() {
+    let curContext = this.curContext();
+    if (!curContext || !curContext.preserveSpace) this.skipSpace();
+
+    this.start = this.pos;
+    this.startLoc = this.curPosition();
+    if (this.pos >= this.input.length) return this.finishToken(tt.eof);
+
+    if (curContext.override) {
+      return curContext.override(this);
+    } else {
+      return this.readToken(this.fullCharCodeAtPos());
+    }
+  }
+
+  readToken(code) {
+    // Identifier or keyword. '\uXXXX' sequences are allowed in
+    // identifiers, so '\' also dispatches to that.
+    if (isIdentifierStart(code, true) || code === 92 /* '\' */)
+      return this.readWord();
+
+    return this.getTokenFromCode(code);
+  }
+
+  fullCharCodeAtPos() {
+    let code = this.input.charCodeAt(this.pos);
+    if (code <= 0xd7ff || code >= 0xe000) return code;
+
+    let next = this.input.charCodeAt(this.pos + 1);
+    return (code << 10) + next - 0x35fdc00;
+  }
+
+  pushComment(block, text, start, end, startLoc, endLoc) {
+    var comment = {
+      type: block ? "CommentBlock" : "CommentLine",
+      value: text,
+      start: start,
+      end: end,
+      loc: new SourceLocation(startLoc, endLoc),
+      range: [start, end]
+    };
+
+    this.tokens.push(comment);
+    this.comments.push(comment);
+    this.addComment(comment);
+  }
+
+  skipBlockComment() {
+    let startLoc = this.curPosition();
+    let start = this.pos, end = this.input.indexOf("*/", this.pos += 2);
+    if (end === -1) this.raise(this.pos - 2, "Unterminated comment");
+
+    this.pos = end + 2;
+    lineBreakG.lastIndex = start;
+    let match;
+    while ((match = lineBreakG.exec(this.input)) && match.index < this.pos) {
+      ++this.curLine;
+      this.lineStart = match.index + match[0].length;
+    }
+
+    this.pushComment(true, this.input.slice(start + 2, end), start, this.pos, startLoc, this.curPosition());
+  }
+
+  skipLineComment(startSkip) {
+    let start = this.pos;
+    let startLoc = this.curPosition();
+    let ch = this.input.charCodeAt(this.pos += startSkip);
+    while (this.pos < this.input.length && ch !== 10 && ch !== 13 && ch !== 8232 && ch !== 8233) {
+      ++this.pos;
+      ch = this.input.charCodeAt(this.pos);
+    }
+
+    this.pushComment(false, this.input.slice(start + startSkip, this.pos), start, this.pos, startLoc, this.curPosition());
+  }
+
+  // Called at the start of the parse and after every token. Skips
+  // whitespace and comments, and.
+
+  skipSpace() {
+    loop: while (this.pos < this.input.length) {
+      let ch = this.input.charCodeAt(this.pos);
+      switch (ch) {
+        case 32: case 160: // ' '
+          ++this.pos;
+          break;
+
+        case 13:
+          if (this.input.charCodeAt(this.pos + 1) === 10) {
+            ++this.pos;
+          }
+
+        case 10: case 8232: case 8233:
+          ++this.pos;
+          ++this.curLine;
+          this.lineStart = this.pos;
+          break;
+
+        case 47: // '/'
+          switch (this.input.charCodeAt(this.pos + 1)) {
+            case 42: // '*'
+              this.skipBlockComment();
+              break;
+
+            case 47:
+              this.skipLineComment(2);
+              break;
+
+            default:
+              break loop;
+          }
+          break;
+
+        default:
+          if (ch > 8 && ch < 14 || ch >= 5760 && nonASCIIwhitespace.test(String.fromCharCode(ch))) {
+            ++this.pos;
+          } else {
+            break loop;
+          }
+      }
+    }
+  }
+
+  // Called at the end of every token. Sets `end`, `val`, and
+  // maintains `context` and `exprAllowed`, and skips the space after
+  // the token, so that the next one's `start` will point at the
+  // right position.
+
+  finishToken(type, val) {
+    this.end = this.pos;
+    this.endLoc = this.curPosition();
+    let prevType = this.type;
+    this.type = type;
+    this.value = val;
+
+    this.updateContext(prevType);
+  }
+
+  // ### Token reading
+
+  // This is the function that is called to fetch the next token. It
+  // is somewhat obscure, because it works in character codes rather
+  // than characters, and because operator parsing has been inlined
+  // into it.
+  //
+  // All in the name of speed.
+  //
+  readToken_dot() {
+    let next = this.input.charCodeAt(this.pos + 1);
+    if (next >= 48 && next <= 57) return this.readNumber(true);
+
+    let next2 = this.input.charCodeAt(this.pos + 2);
+    if (next === 46 && next2 === 46) { // 46 = dot '.'
+      this.pos += 3;
+      return this.finishToken(tt.ellipsis);
+    } else {
+      ++this.pos;
+      return this.finishToken(tt.dot);
+    }
+  }
+
+  readToken_slash() { // '/'
+    let next = this.input.charCodeAt(this.pos + 1);
+    if (this.exprAllowed) {
+      ++this.pos;
+      return this.readRegexp();
+    }
+    if (next === 61) return this.finishOp(tt.assign, 2);
+    return this.finishOp(tt.slash, 1);
+  }
+
+  readToken_mult_modulo(code) { // '%*'
+    var type = code === 42 ? tt.star : tt.modulo;
+    var width = 1;
+    var next = this.input.charCodeAt(this.pos + 1);
+
+    if (next === 42 && this.options.features["es7.exponentiationOperator"]) { // '*'
+      width++;
+      next = this.input.charCodeAt(this.pos + 2);
+      type = tt.exponent;
+    }
+
+    if (next === 61) {
+      width++;
+      type = tt.assign;
+    }
+
+    return this.finishOp(type, width);
+  }
+
+  readToken_pipe_amp(code) { // '|&'
+    let next = this.input.charCodeAt(this.pos + 1);
+    if (next === code) return this.finishOp(code === 124 ? tt.logicalOR : tt.logicalAND, 2);
+    if (next === 61) return this.finishOp(tt.assign, 2);
+    return this.finishOp(code === 124 ? tt.bitwiseOR : tt.bitwiseAND, 1);
+  }
+
+  readToken_caret() { // '^'
+    let next = this.input.charCodeAt(this.pos + 1);
+    if (next === 61) {
+      return this.finishOp(tt.assign, 2);
+    } else {
+      return this.finishOp(tt.bitwiseXOR, 1);
+    }
+  }
+
+  readToken_plus_min(code) { // '+-'
+    let next = this.input.charCodeAt(this.pos + 1);
+
+    if (next === code) {
+      if (next === 45 && this.input.charCodeAt(this.pos + 2) === 62 && lineBreak.test(this.input.slice(this.lastTokEnd, this.pos))) {
+        // A `-->` line comment
+        this.skipLineComment(3);
+        this.skipSpace();
+        return this.nextToken();
+      }
+      return this.finishOp(tt.incDec, 2);
+    }
+
+    if (next === 61) {
+      return this.finishOp(tt.assign, 2);
+    } else {
+      return this.finishOp(tt.plusMin, 1);
+    }
+  }
+
+  readToken_lt_gt(code) { // '<>'
+    let next = this.input.charCodeAt(this.pos + 1);
+    let size = 1;
+
+    if (next === code) {
+      size = code === 62 && this.input.charCodeAt(this.pos + 2) === 62 ? 3 : 2;
+      if (this.input.charCodeAt(this.pos + size) === 61) return this.finishOp(tt.assign, size + 1);
+      return this.finishOp(tt.bitShift, size);
+    }
+
+    if (next === 33 && code === 60 && this.input.charCodeAt(this.pos + 2) === 45 && this.input.charCodeAt(this.pos + 3) === 45) {
+      if (this.inModule) this.unexpected();
+      // `<!--`, an XML-style comment that should be interpreted as a line comment
+      this.skipLineComment(4);
+      this.skipSpace();
+      return this.nextToken();
+    }
+
+    if (next === 61) {
+      size = this.input.charCodeAt(this.pos + 2) === 61 ? 3 : 2;
+    }
+
+    return this.finishOp(tt.relational, size);
+  }
+
+  readToken_eq_excl(code) { // '=!'
+    let next = this.input.charCodeAt(this.pos + 1);
+    if (next === 61) return this.finishOp(tt.equality, this.input.charCodeAt(this.pos + 2) === 61 ? 3 : 2);
+    if (code === 61 && next === 62) { // '=>'
+      this.pos += 2;
+      return this.finishToken(tt.arrow);
+    }
+    return this.finishOp(code === 61 ? tt.eq : tt.prefix, 1);
+  }
+
+  getTokenFromCode(code) {
+    switch (code) {
+      // The interpretation of a dot depends on whether it is followed
+      // by a digit or another two dots.
+      case 46: // '.'
+        return this.readToken_dot();
+
+      // Punctuation tokens.
+      case 40: ++this.pos; return this.finishToken(tt.parenL);
+      case 41: ++this.pos; return this.finishToken(tt.parenR);
+      case 59: ++this.pos; return this.finishToken(tt.semi);
+      case 44: ++this.pos; return this.finishToken(tt.comma);
+      case 91: ++this.pos; return this.finishToken(tt.bracketL);
+      case 93: ++this.pos; return this.finishToken(tt.bracketR);
+      case 123: ++this.pos; return this.finishToken(tt.braceL);
+      case 125: ++this.pos; return this.finishToken(tt.braceR);
+
+      case 58:
+        if (this.options.features["es7.functionBind"] && this.input.charCodeAt(this.pos + 1) === 58) {
+          return this.finishOp(tt.doubleColon, 2);
+        } else {
+          ++this.pos;
+          return this.finishToken(tt.colon);
+        }
+
+      case 63: ++this.pos; return this.finishToken(tt.question);
+      case 64: ++this.pos; return this.finishToken(tt.at);
+
+      case 96: // '`'
+        ++this.pos;
+        return this.finishToken(tt.backQuote);
+
+      case 48: // '0'
+        let next = this.input.charCodeAt(this.pos + 1);
+        if (next === 120 || next === 88) return this.readRadixNumber(16); // '0x', '0X' - hex number
+        if (next === 111 || next === 79) return this.readRadixNumber(8); // '0o', '0O' - octal number
+        if (next === 98 || next === 66) return this.readRadixNumber(2); // '0b', '0B' - binary number
+        // Anything else beginning with a digit is an integer, octal
+        // number, or float.
+      case 49: case 50: case 51: case 52: case 53: case 54: case 55: case 56: case 57: // 1-9
+        return this.readNumber(false);
+
+        // Quotes produce strings.
+      case 34: case 39: // '"', "'"
+        return this.readString(code);
+
+      // Operators are parsed inline in tiny state machines. '=' (61) is
+      // often referred to. `finishOp` simply skips the amount of
+      // characters it is given as second argument, and returns a token
+      // of the type given by its first argument.
+
+      case 47: // '/'
+        return this.readToken_slash();
+
+      case 37: case 42: // '%*'
+        return this.readToken_mult_modulo(code);
+
+      case 124: case 38: // '|&'
+        return this.readToken_pipe_amp(code);
+
+      case 94: // '^'
+        return this.readToken_caret();
+
+      case 43: case 45: // '+-'
+        return this.readToken_plus_min(code);
+
+      case 60: case 62: // '<>'
+        return this.readToken_lt_gt(code);
+
+      case 61: case 33: // '=!'
+        return this.readToken_eq_excl(code);
+
+      case 126: // '~'
+        return this.finishOp(tt.prefix, 1);
+    }
+
+    this.raise(this.pos, `Unexpected character '${codePointToString(code)}'`);
+  }
+
+  finishOp(type, size) {
+    let str = this.input.slice(this.pos, this.pos + size);
+    this.pos += size;
+    return this.finishToken(type, str);
+  }
+
+  readRegexp() {
+    let escaped, inClass, start = this.pos;
+    for (;;) {
+      if (this.pos >= this.input.length) this.raise(start, "Unterminated regular expression");
+      let ch = this.input.charAt(this.pos);
+      if (lineBreak.test(ch)) this.raise(start, "Unterminated regular expression");
+      if (escaped) {
+        escaped = false;
+      } else {
+        if (ch === "[") inClass = true;
+        else if (ch === "]" && inClass) inClass = false;
+        else if (ch === "/" && !inClass) break;
+        escaped = ch === "\\";
+      }
+      ++this.pos;
+    }
+    let content = this.input.slice(start, this.pos);
+    ++this.pos;
+    // Need to use `readWord1` because '\uXXXX' sequences are allowed
+    // here (don't ask).
+    let mods = this.readWord1();
+    let tmp = content;
+    if (mods) {
+      let validFlags = /^[gmsiyu]*$/;
+      if (!validFlags.test(mods)) this.raise(start, "Invalid regular expression flag");
+      if (mods.indexOf("u") >= 0 && !regexpUnicodeSupport) {
+        // Replace each astral symbol and every Unicode escape sequence that
+        // possibly represents an astral symbol or a paired surrogate with a
+        // single ASCII symbol to avoid throwing on regular expressions that
+        // are only valid in combination with the `/u` flag.
+        // Note: replacing with the ASCII symbol `x` might cause false
+        // negatives in unlikely scenarios. For example, `[\u{61}-b]` is a
+        // perfectly valid pattern that is equivalent to `[a-b]`, but it would
+        // be replaced by `[x-b]` which throws an error.
+        tmp = tmp.replace(/\\u\{([0-9a-fA-F]+)\}/g, (match, code, offset) => {
+          code = Number("0x" + code);
+          if (code > 0x10FFFF) this.raise(start + offset + 3, "Code point out of bounds");
+          return "x";
+        });
+        tmp = tmp.replace(/\\u([a-fA-F0-9]{4})|[\uD800-\uDBFF][\uDC00-\uDFFF]/g, "x");
+      }
+    }
+    // Detect invalid regular expressions.
+    let value = null;
+    // Rhino's regular expression parser is flaky and throws uncatchable exceptions,
+    // so don't do detection if we are running under Rhino
+    if (!isRhino) {
+      tryCreateRegexp.call(this, tmp, undefined, start);
+      // Get a regular expression object for this pattern-flag pair, or `null` in
+      // case the current environment doesn't support the flags it uses.
+      value = tryCreateRegexp.call(this, content, mods);
+    }
+    return this.finishToken(tt.regexp, {pattern: content, flags: mods, value: value});
+  }
+
+  // Read an integer in the given radix. Return null if zero digits
+  // were read, the integer value otherwise. When `len` is given, this
+  // will return `null` unless the integer has exactly `len` digits.
+
+  readInt(radix, len) {
+    let start = this.pos, total = 0;
+    for (let i = 0, e = len == null ? Infinity : len; i < e; ++i) {
+      let code = this.input.charCodeAt(this.pos), val;
+      if (code >= 97) val = code - 97 + 10; // a
+      else if (code >= 65) val = code - 65 + 10; // A
+      else if (code >= 48 && code <= 57) val = code - 48; // 0-9
+      else val = Infinity;
+      if (val >= radix) break;
+      ++this.pos;
+      total = total * radix + val;
+    }
+    if (this.pos === start || len != null && this.pos - start !== len) return null;
+
+    return total;
+  }
+
+  readRadixNumber(radix) {
+    this.pos += 2; // 0x
+    let val = this.readInt(radix);
+    if (val == null) this.raise(this.start + 2, "Expected number in radix " + radix);
+    if (isIdentifierStart(this.fullCharCodeAtPos())) this.raise(this.pos, "Identifier directly after number");
+    return this.finishToken(tt.num, val);
+  }
+
+  // Read an integer, octal integer, or floating-point number.
+
+  readNumber(startsWithDot) {
+    let start = this.pos, isFloat = false, octal = this.input.charCodeAt(this.pos) === 48;
+    if (!startsWithDot && this.readInt(10) === null) this.raise(start, "Invalid number");
+    let next = this.input.charCodeAt(this.pos);
+    if (next === 46) { // '.'
+      ++this.pos;
+      this.readInt(10);
+      isFloat = true;
+      next = this.input.charCodeAt(this.pos);
+    }
+    if (next === 69 || next === 101) { // 'eE'
+      next = this.input.charCodeAt(++this.pos);
+      if (next === 43 || next === 45) ++this.pos; // '+-'
+      if (this.readInt(10) === null) this.raise(start, "Invalid number");
+      isFloat = true;
+    }
+    if (isIdentifierStart(this.fullCharCodeAtPos())) this.raise(this.pos, "Identifier directly after number");
+
+    let str = this.input.slice(start, this.pos), val;
+    if (isFloat) val = parseFloat(str);
+    else if (!octal || str.length === 1) val = parseInt(str, 10);
+    else if (/[89]/.test(str) || this.strict) this.raise(start, "Invalid number");
+    else val = parseInt(str, 8);
+    return this.finishToken(tt.num, val);
+  }
+
+  // Read a string value, interpreting backslash-escapes.
+
+  readCodePoint() {
+    let ch = this.input.charCodeAt(this.pos), code;
+
+    if (ch === 123) {
+      let codePos = ++this.pos;
+      code = this.readHexChar(this.input.indexOf("}", this.pos) - this.pos);
+      ++this.pos;
+      if (code > 0x10FFFF) this.raise(codePos, "Code point out of bounds");
+    } else {
+      code = this.readHexChar(4);
+    }
+    return code;
+  }
+
+  readString(quote) {
+    let out = "", chunkStart = ++this.pos;
+    for (;;) {
+      if (this.pos >= this.input.length) this.raise(this.start, "Unterminated string constant");
+      let ch = this.input.charCodeAt(this.pos);
+      if (ch === quote) break;
+      if (ch === 92) { // '\'
+        out += this.input.slice(chunkStart, this.pos);
+        out += this.readEscapedChar(false);
+        chunkStart = this.pos;
+      } else {
+        if (isNewLine(ch)) this.raise(this.start, "Unterminated string constant");
+        ++this.pos;
+      }
+    }
+    out += this.input.slice(chunkStart, this.pos++);
+    return this.finishToken(tt.string, out);
+  }
+
+  // Reads template string tokens.
+
+  readTmplToken() {
+    let out = "", chunkStart = this.pos;
+    for (;;) {
+      if (this.pos >= this.input.length) this.raise(this.start, "Unterminated template");
+      let ch = this.input.charCodeAt(this.pos);
+      if (ch === 96 || ch === 36 && this.input.charCodeAt(this.pos + 1) === 123) { // '`', '${'
+        if (this.pos === this.start && this.type === tt.template) {
+          if (ch === 36) {
+            this.pos += 2;
+            return this.finishToken(tt.dollarBraceL);
+          } else {
+            ++this.pos;
+            return this.finishToken(tt.backQuote);
+          }
+        }
+        out += this.input.slice(chunkStart, this.pos);
+        return this.finishToken(tt.template, out);
+      }
+      if (ch === 92) { // '\'
+        out += this.input.slice(chunkStart, this.pos);
+        out += this.readEscapedChar(true);
+        chunkStart = this.pos;
+      } else if (isNewLine(ch)) {
+        out += this.input.slice(chunkStart, this.pos);
+        ++this.pos;
+        switch (ch) {
+          case 13:
+            if (this.input.charCodeAt(this.pos) === 10) ++this.pos;
+          case 10:
+            out += "\n";
+            break;
+          default:
+            out += String.fromCharCode(ch);
+            break;
+        }
+        ++this.curLine;
+        this.lineStart = this.pos;
+        chunkStart = this.pos;
+      } else {
+        ++this.pos;
+      }
+    }
+  }
+
+  // Used to read escaped characters
+
+  readEscapedChar(inTemplate) {
+    let ch = this.input.charCodeAt(++this.pos);
+    ++this.pos;
+    switch (ch) {
+      case 110: return "\n"; // 'n' -> '\n'
+      case 114: return "\r"; // 'r' -> '\r'
+      case 120: return String.fromCharCode(this.readHexChar(2)); // 'x'
+      case 117: return codePointToString(this.readCodePoint()); // 'u'
+      case 116: return "\t"; // 't' -> '\t'
+      case 98: return "\b"; // 'b' -> '\b'
+      case 118: return "\u000b"; // 'v' -> '\u000b'
+      case 102: return "\f"; // 'f' -> '\f'
+      case 13: if (this.input.charCodeAt(this.pos) === 10) ++this.pos; // '\r\n'
+      case 10: // ' \n'
+        this.lineStart = this.pos;
+        ++this.curLine;
+        return "";
+      default:
+        if (ch >= 48 && ch <= 55) {
+          let octalStr = this.input.substr(this.pos - 1, 3).match(/^[0-7]+/)[0];
+          let octal = parseInt(octalStr, 8);
+          if (octal > 255) {
+            octalStr = octalStr.slice(0, -1);
+            octal = parseInt(octalStr, 8);
+          }
+          if (octal > 0 && (this.strict || inTemplate)) {
+            this.raise(this.pos - 2, "Octal literal in strict mode");
+          }
+          this.pos += octalStr.length - 1;
+          return String.fromCharCode(octal);
+        }
+        return String.fromCharCode(ch);
+    }
+  }
+
+  // Used to read character escape sequences ('\x', '\u', '\U').
+
+  readHexChar(len) {
+    let codePos = this.pos;
+    let n = this.readInt(16, len);
+    if (n === null) this.raise(codePos, "Bad character escape sequence");
+    return n;
+  }
+
+  // Read an identifier, and return it as a string. Sets `containsEsc`
+  // to whether the word contained a '\u' escape.
+  //
+  // Incrementally adds only escaped chars, adding other chunks as-is
+  // as a micro-optimization.
+
+  readWord1() {
+    containsEsc = false;
+    let word = "", first = true, chunkStart = this.pos;
+    while (this.pos < this.input.length) {
+      let ch = this.fullCharCodeAtPos();
+      if (isIdentifierChar(ch, true)) {
+        this.pos += ch <= 0xffff ? 1 : 2;
+      } else if (ch === 92) { // "\"
+        containsEsc = true;
+
+        word += this.input.slice(chunkStart, this.pos);
+        let escStart = this.pos;
+
+        if (this.input.charCodeAt(++this.pos) !== 117) { // "u"
+          this.raise(this.pos, "Expecting Unicode escape sequence \\uXXXX");
+        }
+
+        ++this.pos;
+        let esc = this.readCodePoint();
+        if (!(first ? isIdentifierStart : isIdentifierChar)(esc, true)) {
+          this.raise(escStart, "Invalid Unicode escape");
+        }
+
+        word += codePointToString(esc);
+        chunkStart = this.pos;
+      } else {
+        break;
+      }
+      first = false;
+    }
+    return word + this.input.slice(chunkStart, this.pos);
+  }
+
+  // Read an identifier or keyword token. Will check for reserved
+  // words when necessary.
+
+  readWord() {
+    let word = this.readWord1();
+    let type = tt.name;
+    if (!containsEsc && this.isKeyword(word))
+      type = keywordTypes[word];
+    return this.finishToken(type, word);
+  }
+}
diff --git a/src/tokentype.js b/src/tokenizer/types.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/tokentype.js
rename to src/tokenizer/types.js
diff --git a/src/util.js b/src/util.js
deleted file mode 100755
index 7b8cae8a22..0000000000
--- a/src/util.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// Checks if an object has a property.
-
-export function has(obj, propName) {
-  return Object.prototype.hasOwnProperty.call(obj, propName);
-}
diff --git a/src/identifier.js b/src/util/identifier.js
old mode 100755
new mode 100644
similarity index 94%
rename from src/identifier.js
rename to src/util/identifier.js
index a656c92320..3bfe47cb36
--- a/src/identifier.js
+++ b/src/util/identifier.js
@@ -17,8 +17,6 @@ function makePredicate(words) {
 // Reserved word lists for various dialects of the language
 
 export const reservedWords = {
-  3: makePredicate("abstract boolean byte char class double enum export extends final float goto implements import int interface long native package private protected public short static super synchronized throws transient volatile"),
-  5: makePredicate("class enum extends super const export import"),
   6: makePredicate("enum await"),
   strict: makePredicate("implements interface let package private protected public static yield"),
   strictBind: makePredicate("eval arguments")
@@ -26,12 +24,7 @@ export const reservedWords = {
 
 // And the keywords
 
-var ecma5AndLessKeywords = "break case catch continue debugger default do else finally for function if return switch throw try var while with null true false instanceof typeof void delete new in this";
-
-export const keywords = {
-  5: makePredicate(ecma5AndLessKeywords),
-  6: makePredicate(ecma5AndLessKeywords + " let const class extends export import yield super")
-};
+export const isKeyword = makePredicate("break case catch continue debugger default do else finally for function if return switch throw try var while with null true false instanceof typeof void delete new in this let const class extends export import yield super");
 
 // ## Character categories
 
diff --git a/src/whitespace.js b/src/util/whitespace.js
old mode 100755
new mode 100644
similarity index 99%
rename from src/whitespace.js
rename to src/util/whitespace.js
index c7956b46ab..d517d1f28a
--- a/src/whitespace.js
+++ b/src/util/whitespace.js
@@ -9,4 +9,3 @@ export function isNewLine(code) {
 }
 
 export const nonASCIIwhitespace = /[\u1680\u180e\u2000-\u200a\u202f\u205f\u3000\ufeff]/;
-
diff --git a/test/fixtures/comments/basic/block-trailing-comment/expected.json b/test/fixtures/comments/basic/block-trailing-comment/expected.json
index d0d4965960..e6e6b73fc4 100755
--- a/test/fixtures/comments/basic/block-trailing-comment/expected.json
+++ b/test/fixtures/comments/basic/block-trailing-comment/expected.json
@@ -1,53 +1,52 @@
 {
   "type": "File",
+  "start": 0,
+  "end": 26,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 4,
+      "column": 1
+    }
+  },
   "program": {
     "type": "Program",
+    "start": 0,
+    "end": 26,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 4,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
     "body": [
       {
         "type": "BlockStatement",
+        "start": 0,
+        "end": 26,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 4,
+            "column": 1
+          }
+        },
         "body": [
           {
             "type": "ExpressionStatement",
-            "expression": {
-              "type": "CallExpression",
-              "callee": {
-                "type": "Identifier",
-                "name": "a",
-                "range": [
-                  6,
-                  7
-                ],
-                "loc": {
-                  "start": {
-                    "line": 2,
-                    "column": 4
-                  },
-                  "end": {
-                    "line": 2,
-                    "column": 5
-                  }
-                }
-              },
-              "arguments": [],
-              "range": [
-                6,
-                9
-              ],
-              "loc": {
-                "start": {
-                  "line": 2,
-                  "column": 4
-                },
-                "end": {
-                  "line": 2,
-                  "column": 7
-                }
-              }
-            },
-            "range": [
-              6,
-              10
-            ],
+            "start": 6,
+            "end": 10,
             "loc": {
               "start": {
                 "line": 2,
@@ -58,14 +57,44 @@
                 "column": 8
               }
             },
+            "expression": {
+              "type": "CallExpression",
+              "start": 6,
+              "end": 9,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 4
+                },
+                "end": {
+                  "line": 2,
+                  "column": 7
+                }
+              },
+              "callee": {
+                "type": "Identifier",
+                "start": 6,
+                "end": 7,
+                "loc": {
+                  "start": {
+                    "line": 2,
+                    "column": 4
+                  },
+                  "end": {
+                    "line": 2,
+                    "column": 5
+                  }
+                },
+                "name": "a"
+              },
+              "arguments": []
+            },
             "trailingComments": [
               {
                 "type": "CommentLine",
                 "value": "comment",
-                "range": [
-                  15,
-                  24
-                ],
+                "start": 15,
+                "end": 24,
                 "loc": {
                   "start": {
                     "line": 3,
@@ -75,51 +104,24 @@
                     "line": 3,
                     "column": 13
                   }
-                }
+                },
+                "range": [
+                  15,
+                  24
+                ]
               }
             ]
           }
-        ],
-        "range": [
-          0,
-          26
-        ],
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 0
-          },
-          "end": {
-            "line": 4,
-            "column": 1
-          }
-        }
+        ]
       }
-    ],
-    "sourceType": "script",
-    "range": [
-      0,
-      26
-    ],
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 4,
-        "column": 1
-      }
-    }
+    ]
   },
   "comments": [
     {
       "type": "CommentLine",
       "value": "comment",
-      "range": [
-        15,
-        24
-      ],
+      "start": 15,
+      "end": 24,
       "loc": {
         "start": {
           "line": 3,
@@ -129,7 +131,11 @@
           "line": 3,
           "column": 13
         }
-      }
+      },
+      "range": [
+        15,
+        24
+      ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/test/fixtures/comments/basic/comment-within-condition/expected.json b/test/fixtures/comments/basic/comment-within-condition/expected.json
index d6cc6f11c4..3affb6e924 100755
--- a/test/fixtures/comments/basic/comment-within-condition/expected.json
+++ b/test/fixtures/comments/basic/comment-within-condition/expected.json
@@ -1,71 +1,37 @@
 {
   "type": "File",
+  "start": 0,
+  "end": 30,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 2,
+      "column": 20
+    }
+  },
   "program": {
     "type": "Program",
+    "start": 0,
+    "end": 30,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 2,
+        "column": 20
+      }
+    },
+    "sourceType": "script",
     "body": [
       {
         "type": "IfStatement",
-        "test": {
-          "type": "Identifier",
-          "name": "a",
-          "range": [
-            25,
-            26
-          ],
-          "loc": {
-            "start": {
-              "line": 2,
-              "column": 15
-            },
-            "end": {
-              "line": 2,
-              "column": 16
-            }
-          },
-          "leadingComments": [
-            {
-              "type": "CommentBlock",
-              "value": " bar ",
-              "range": [
-                14,
-                23
-              ],
-              "loc": {
-                "start": {
-                  "line": 2,
-                  "column": 4
-                },
-                "end": {
-                  "line": 2,
-                  "column": 13
-                }
-              }
-            }
-          ]
-        },
-        "consequent": {
-          "type": "BlockStatement",
-          "body": [],
-          "range": [
-            28,
-            30
-          ],
-          "loc": {
-            "start": {
-              "line": 2,
-              "column": 18
-            },
-            "end": {
-              "line": 2,
-              "column": 20
-            }
-          }
-        },
-        "alternate": null,
-        "range": [
-          10,
-          30
-        ],
+        "start": 10,
+        "end": 30,
         "loc": {
           "start": {
             "line": 2,
@@ -76,14 +42,67 @@
             "column": 20
           }
         },
+        "test": {
+          "type": "Identifier",
+          "start": 25,
+          "end": 26,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 15
+            },
+            "end": {
+              "line": 2,
+              "column": 16
+            }
+          },
+          "name": "a",
+          "leadingComments": [
+            {
+              "type": "CommentBlock",
+              "value": " bar ",
+              "start": 14,
+              "end": 23,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 4
+                },
+                "end": {
+                  "line": 2,
+                  "column": 13
+                }
+              },
+              "range": [
+                14,
+                23
+              ]
+            }
+          ]
+        },
+        "consequent": {
+          "type": "BlockStatement",
+          "start": 28,
+          "end": 30,
+          "loc": {
+            "start": {
+              "line": 2,
+              "column": 18
+            },
+            "end": {
+              "line": 2,
+              "column": 20
+            }
+          },
+          "body": []
+        },
+        "alternate": null,
         "leadingComments": [
           {
             "type": "CommentBlock",
             "value": " foo ",
-            "range": [
-              0,
-              9
-            ],
+            "start": 0,
+            "end": 9,
             "loc": {
               "start": {
                 "line": 1,
@@ -93,35 +112,22 @@
                 "line": 1,
                 "column": 9
               }
-            }
+            },
+            "range": [
+              0,
+              9
+            ]
           }
         ]
       }
-    ],
-    "sourceType": "script",
-    "range": [
-      0,
-      30
-    ],
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 2,
-        "column": 20
-      }
-    }
+    ]
   },
   "comments": [
     {
       "type": "CommentBlock",
       "value": " foo ",
-      "range": [
-        0,
-        9
-      ],
+      "start": 0,
+      "end": 9,
       "loc": {
         "start": {
           "line": 1,
@@ -131,15 +137,17 @@
           "line": 1,
           "column": 9
         }
-      }
+      },
+      "range": [
+        0,
+        9
+      ]
     },
     {
       "type": "CommentBlock",
       "value": " bar ",
-      "range": [
-        14,
-        23
-      ],
+      "start": 14,
+      "end": 23,
       "loc": {
         "start": {
           "line": 2,
@@ -149,7 +157,11 @@
           "line": 2,
           "column": 13
         }
-      }
+      },
+      "range": [
+        14,
+        23
+      ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/test/fixtures/comments/basic/export-default-anonymous-class/expected.json b/test/fixtures/comments/basic/export-default-anonymous-class/expected.json
index f6047fc1a3..fc2086aeee 100755
--- a/test/fixtures/comments/basic/export-default-anonymous-class/expected.json
+++ b/test/fixtures/comments/basic/export-default-anonymous-class/expected.json
@@ -1,149 +1,37 @@
 {
   "type": "File",
+  "start": 0,
+  "end": 121,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 10,
+      "column": 1
+    }
+  },
   "program": {
     "type": "Program",
+    "start": 0,
+    "end": 121,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 10,
+        "column": 1
+      }
+    },
+    "sourceType": "module",
     "body": [
       {
         "type": "ExportDefaultDeclaration",
-        "declaration": {
-          "type": "ClassExpression",
-          "id": null,
-          "superClass": null,
-          "body": {
-            "type": "ClassBody",
-            "body": [
-              {
-                "type": "MethodDefinition",
-                "key": {
-                  "type": "Identifier",
-                  "name": "method1",
-                  "range": [
-                    103,
-                    110
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 8,
-                      "column": 4
-                    },
-                    "end": {
-                      "line": 8,
-                      "column": 11
-                    }
-                  }
-                },
-                "value": {
-                  "type": "FunctionExpression",
-                  "id": null,
-                  "params": [],
-                  "body": {
-                    "type": "BlockStatement",
-                    "body": [],
-                    "range": [
-                      112,
-                      119
-                    ],
-                    "loc": {
-                      "start": {
-                        "line": 8,
-                        "column": 13
-                      },
-                      "end": {
-                        "line": 9,
-                        "column": 5
-                      }
-                    }
-                  },
-                  "generator": false,
-                  "expression": false,
-                  "range": [
-                    110,
-                    119
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 8,
-                      "column": 11
-                    },
-                    "end": {
-                      "line": 9,
-                      "column": 5
-                    }
-                  }
-                },
-                "kind": "method",
-                "computed": false,
-                "range": [
-                  103,
-                  119
-                ],
-                "loc": {
-                  "start": {
-                    "line": 8,
-                    "column": 4
-                  },
-                  "end": {
-                    "line": 9,
-                    "column": 5
-                  }
-                },
-                "leadingComments": [
-                  {
-                    "type": "CommentBlock",
-                    "value": "*\n     * this is method1.\n     ",
-                    "range": [
-                      63,
-                      98
-                    ],
-                    "loc": {
-                      "start": {
-                        "line": 5,
-                        "column": 4
-                      },
-                      "end": {
-                        "line": 7,
-                        "column": 7
-                      }
-                    }
-                  }
-                ],
-                "static": false
-              }
-            ],
-            "range": [
-              57,
-              121
-            ],
-            "loc": {
-              "start": {
-                "line": 4,
-                "column": 21
-              },
-              "end": {
-                "line": 10,
-                "column": 1
-              }
-            }
-          },
-          "range": [
-            51,
-            121
-          ],
-          "loc": {
-            "start": {
-              "line": 4,
-              "column": 15
-            },
-            "end": {
-              "line": 10,
-              "column": 1
-            }
-          }
-        },
-        "range": [
-          36,
-          121
-        ],
+        "start": 36,
+        "end": 121,
         "loc": {
           "start": {
             "line": 4,
@@ -154,14 +42,140 @@
             "column": 1
           }
         },
+        "declaration": {
+          "type": "ClassExpression",
+          "start": 51,
+          "end": 121,
+          "loc": {
+            "start": {
+              "line": 4,
+              "column": 15
+            },
+            "end": {
+              "line": 10,
+              "column": 1
+            }
+          },
+          "id": null,
+          "superClass": null,
+          "body": {
+            "type": "ClassBody",
+            "start": 57,
+            "end": 121,
+            "loc": {
+              "start": {
+                "line": 4,
+                "column": 21
+              },
+              "end": {
+                "line": 10,
+                "column": 1
+              }
+            },
+            "body": [
+              {
+                "type": "MethodDefinition",
+                "start": 103,
+                "end": 119,
+                "loc": {
+                  "start": {
+                    "line": 8,
+                    "column": 4
+                  },
+                  "end": {
+                    "line": 9,
+                    "column": 5
+                  }
+                },
+                "computed": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 103,
+                  "end": 110,
+                  "loc": {
+                    "start": {
+                      "line": 8,
+                      "column": 4
+                    },
+                    "end": {
+                      "line": 8,
+                      "column": 11
+                    }
+                  },
+                  "name": "method1",
+                  "leadingComments": null
+                },
+                "static": false,
+                "kind": "method",
+                "value": {
+                  "type": "FunctionExpression",
+                  "start": 110,
+                  "end": 119,
+                  "loc": {
+                    "start": {
+                      "line": 8,
+                      "column": 11
+                    },
+                    "end": {
+                      "line": 9,
+                      "column": 5
+                    }
+                  },
+                  "id": null,
+                  "generator": false,
+                  "expression": false,
+                  "params": [],
+                  "body": {
+                    "type": "BlockStatement",
+                    "start": 112,
+                    "end": 119,
+                    "loc": {
+                      "start": {
+                        "line": 8,
+                        "column": 13
+                      },
+                      "end": {
+                        "line": 9,
+                        "column": 5
+                      }
+                    },
+                    "body": []
+                  }
+                },
+                "leadingComments": [
+                  {
+                    "type": "CommentBlock",
+                    "value": "*\n     * this is method1.\n     ",
+                    "start": 63,
+                    "end": 98,
+                    "loc": {
+                      "start": {
+                        "line": 5,
+                        "column": 4
+                      },
+                      "end": {
+                        "line": 7,
+                        "column": 7
+                      }
+                    },
+                    "range": [
+                      63,
+                      98
+                    ]
+                  }
+                ]
+              }
+            ],
+            "leadingComments": null
+          },
+          "leadingComments": null
+        },
         "leadingComments": [
           {
             "type": "CommentBlock",
             "value": "*\n * this is anonymous class.\n ",
-            "range": [
-              0,
-              35
-            ],
+            "start": 0,
+            "end": 35,
             "loc": {
               "start": {
                 "line": 1,
@@ -171,35 +185,22 @@
                 "line": 3,
                 "column": 3
               }
-            }
+            },
+            "range": [
+              0,
+              35
+            ]
           }
         ]
       }
-    ],
-    "sourceType": "module",
-    "range": [
-      0,
-      121
-    ],
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 10,
-        "column": 1
-      }
-    }
+    ]
   },
   "comments": [
     {
       "type": "CommentBlock",
       "value": "*\n * this is anonymous class.\n ",
-      "range": [
-        0,
-        35
-      ],
+      "start": 0,
+      "end": 35,
       "loc": {
         "start": {
           "line": 1,
@@ -209,15 +210,17 @@
           "line": 3,
           "column": 3
         }
-      }
+      },
+      "range": [
+        0,
+        35
+      ]
     },
     {
       "type": "CommentBlock",
       "value": "*\n     * this is method1.\n     ",
-      "range": [
-        63,
-        98
-      ],
+      "start": 63,
+      "end": 98,
       "loc": {
         "start": {
           "line": 5,
@@ -227,7 +230,11 @@
           "line": 7,
           "column": 7
         }
-      }
+      },
+      "range": [
+        63,
+        98
+      ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/test/fixtures/comments/basic/surrounding-call-comments/expected.json b/test/fixtures/comments/basic/surrounding-call-comments/expected.json
index 7ba441fe45..2b2736473b 100755
--- a/test/fixtures/comments/basic/surrounding-call-comments/expected.json
+++ b/test/fixtures/comments/basic/surrounding-call-comments/expected.json
@@ -1,17 +1,51 @@
 {
   "type": "File",
+  "start": 0,
+  "end": 60,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 5,
+      "column": 1
+    }
+  },
   "program": {
     "type": "Program",
+    "start": 0,
+    "end": 60,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 5,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
     "body": [
       {
         "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 60,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 5,
+            "column": 1
+          }
+        },
         "id": {
           "type": "Identifier",
-          "name": "a",
-          "range": [
-            9,
-            10
-          ],
+          "start": 9,
+          "end": 10,
           "loc": {
             "start": {
               "line": 1,
@@ -21,54 +55,31 @@
               "line": 1,
               "column": 10
             }
-          }
+          },
+          "name": "a"
         },
+        "generator": false,
+        "expression": false,
         "params": [],
         "body": {
           "type": "BlockStatement",
+          "start": 13,
+          "end": 60,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 13
+            },
+            "end": {
+              "line": 5,
+              "column": 1
+            }
+          },
           "body": [
             {
               "type": "ExpressionStatement",
-              "expression": {
-                "type": "CallExpression",
-                "callee": {
-                  "type": "Identifier",
-                  "name": "foo",
-                  "range": [
-                    36,
-                    39
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 3,
-                      "column": 4
-                    },
-                    "end": {
-                      "line": 3,
-                      "column": 7
-                    }
-                  }
-                },
-                "arguments": [],
-                "range": [
-                  36,
-                  41
-                ],
-                "loc": {
-                  "start": {
-                    "line": 3,
-                    "column": 4
-                  },
-                  "end": {
-                    "line": 3,
-                    "column": 9
-                  }
-                }
-              },
-              "range": [
-                36,
-                42
-              ],
+              "start": 36,
+              "end": 42,
               "loc": {
                 "start": {
                   "line": 3,
@@ -79,14 +90,46 @@
                   "column": 10
                 }
               },
+              "expression": {
+                "type": "CallExpression",
+                "start": 36,
+                "end": 41,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 4
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 9
+                  }
+                },
+                "callee": {
+                  "type": "Identifier",
+                  "start": 36,
+                  "end": 39,
+                  "loc": {
+                    "start": {
+                      "line": 3,
+                      "column": 4
+                    },
+                    "end": {
+                      "line": 3,
+                      "column": 7
+                    }
+                  },
+                  "name": "foo",
+                  "leadingComments": null
+                },
+                "arguments": [],
+                "leadingComments": null
+              },
               "leadingComments": [
                 {
                   "type": "CommentBlock",
                   "value": " before ",
-                  "range": [
-                    19,
-                    31
-                  ],
+                  "start": 19,
+                  "end": 31,
                   "loc": {
                     "start": {
                       "line": 2,
@@ -96,17 +139,19 @@
                       "line": 2,
                       "column": 16
                     }
-                  }
+                  },
+                  "range": [
+                    19,
+                    31
+                  ]
                 }
               ],
               "trailingComments": [
                 {
                   "type": "CommentBlock",
                   "value": " after ",
-                  "range": [
-                    47,
-                    58
-                  ],
+                  "start": 47,
+                  "end": 58,
                   "loc": {
                     "start": {
                       "line": 4,
@@ -116,68 +161,25 @@
                       "line": 4,
                       "column": 15
                     }
-                  }
+                  },
+                  "range": [
+                    47,
+                    58
+                  ]
                 }
               ]
             }
-          ],
-          "range": [
-            13,
-            60
-          ],
-          "loc": {
-            "start": {
-              "line": 1,
-              "column": 13
-            },
-            "end": {
-              "line": 5,
-              "column": 1
-            }
-          }
-        },
-        "generator": false,
-        "expression": false,
-        "range": [
-          0,
-          60
-        ],
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 0
-          },
-          "end": {
-            "line": 5,
-            "column": 1
-          }
+          ]
         }
       }
-    ],
-    "sourceType": "script",
-    "range": [
-      0,
-      60
-    ],
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 5,
-        "column": 1
-      }
-    }
+    ]
   },
   "comments": [
     {
       "type": "CommentBlock",
       "value": " before ",
-      "range": [
-        19,
-        31
-      ],
+      "start": 19,
+      "end": 31,
       "loc": {
         "start": {
           "line": 2,
@@ -187,15 +189,17 @@
           "line": 2,
           "column": 16
         }
-      }
+      },
+      "range": [
+        19,
+        31
+      ]
     },
     {
       "type": "CommentBlock",
       "value": " after ",
-      "range": [
-        47,
-        58
-      ],
+      "start": 47,
+      "end": 58,
       "loc": {
         "start": {
           "line": 4,
@@ -205,7 +209,11 @@
           "line": 4,
           "column": 15
         }
-      }
+      },
+      "range": [
+        47,
+        58
+      ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/test/fixtures/comments/basic/surrounding-debugger-comments/expected.json b/test/fixtures/comments/basic/surrounding-debugger-comments/expected.json
index f302ece3bd..8eb698f9f3 100755
--- a/test/fixtures/comments/basic/surrounding-debugger-comments/expected.json
+++ b/test/fixtures/comments/basic/surrounding-debugger-comments/expected.json
@@ -1,17 +1,51 @@
 {
   "type": "File",
+  "start": 0,
+  "end": 63,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 5,
+      "column": 1
+    }
+  },
   "program": {
     "type": "Program",
+    "start": 0,
+    "end": 63,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 5,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
     "body": [
       {
         "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 63,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 5,
+            "column": 1
+          }
+        },
         "id": {
           "type": "Identifier",
-          "name": "a",
-          "range": [
-            9,
-            10
-          ],
+          "start": 9,
+          "end": 10,
           "loc": {
             "start": {
               "line": 1,
@@ -21,18 +55,31 @@
               "line": 1,
               "column": 10
             }
-          }
+          },
+          "name": "a"
         },
+        "generator": false,
+        "expression": false,
         "params": [],
         "body": {
           "type": "BlockStatement",
+          "start": 13,
+          "end": 63,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 13
+            },
+            "end": {
+              "line": 5,
+              "column": 1
+            }
+          },
           "body": [
             {
               "type": "DebuggerStatement",
-              "range": [
-                36,
-                45
-              ],
+              "start": 36,
+              "end": 45,
               "loc": {
                 "start": {
                   "line": 3,
@@ -47,10 +94,8 @@
                 {
                   "type": "CommentBlock",
                   "value": " before ",
-                  "range": [
-                    19,
-                    31
-                  ],
+                  "start": 19,
+                  "end": 31,
                   "loc": {
                     "start": {
                       "line": 2,
@@ -60,17 +105,19 @@
                       "line": 2,
                       "column": 16
                     }
-                  }
+                  },
+                  "range": [
+                    19,
+                    31
+                  ]
                 }
               ],
               "trailingComments": [
                 {
                   "type": "CommentBlock",
                   "value": " after ",
-                  "range": [
-                    50,
-                    61
-                  ],
+                  "start": 50,
+                  "end": 61,
                   "loc": {
                     "start": {
                       "line": 4,
@@ -80,68 +127,25 @@
                       "line": 4,
                       "column": 15
                     }
-                  }
+                  },
+                  "range": [
+                    50,
+                    61
+                  ]
                 }
               ]
             }
-          ],
-          "range": [
-            13,
-            63
-          ],
-          "loc": {
-            "start": {
-              "line": 1,
-              "column": 13
-            },
-            "end": {
-              "line": 5,
-              "column": 1
-            }
-          }
-        },
-        "generator": false,
-        "expression": false,
-        "range": [
-          0,
-          63
-        ],
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 0
-          },
-          "end": {
-            "line": 5,
-            "column": 1
-          }
+          ]
         }
       }
-    ],
-    "sourceType": "script",
-    "range": [
-      0,
-      63
-    ],
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 5,
-        "column": 1
-      }
-    }
+    ]
   },
   "comments": [
     {
       "type": "CommentBlock",
       "value": " before ",
-      "range": [
-        19,
-        31
-      ],
+      "start": 19,
+      "end": 31,
       "loc": {
         "start": {
           "line": 2,
@@ -151,15 +155,17 @@
           "line": 2,
           "column": 16
         }
-      }
+      },
+      "range": [
+        19,
+        31
+      ]
     },
     {
       "type": "CommentBlock",
       "value": " after ",
-      "range": [
-        50,
-        61
-      ],
+      "start": 50,
+      "end": 61,
       "loc": {
         "start": {
           "line": 4,
@@ -169,7 +175,11 @@
           "line": 4,
           "column": 15
         }
-      }
+      },
+      "range": [
+        50,
+        61
+      ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/test/fixtures/comments/basic/surrounding-return-comments/expected.json b/test/fixtures/comments/basic/surrounding-return-comments/expected.json
index 161f31cba1..48dbc2e395 100755
--- a/test/fixtures/comments/basic/surrounding-return-comments/expected.json
+++ b/test/fixtures/comments/basic/surrounding-return-comments/expected.json
@@ -1,17 +1,51 @@
 {
   "type": "File",
+  "start": 0,
+  "end": 61,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 5,
+      "column": 1
+    }
+  },
   "program": {
     "type": "Program",
+    "start": 0,
+    "end": 61,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 5,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
     "body": [
       {
         "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 61,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 5,
+            "column": 1
+          }
+        },
         "id": {
           "type": "Identifier",
-          "name": "a",
-          "range": [
-            9,
-            10
-          ],
+          "start": 9,
+          "end": 10,
           "loc": {
             "start": {
               "line": 1,
@@ -21,19 +55,31 @@
               "line": 1,
               "column": 10
             }
-          }
+          },
+          "name": "a"
         },
+        "generator": false,
+        "expression": false,
         "params": [],
         "body": {
           "type": "BlockStatement",
+          "start": 13,
+          "end": 61,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 13
+            },
+            "end": {
+              "line": 5,
+              "column": 1
+            }
+          },
           "body": [
             {
               "type": "ReturnStatement",
-              "argument": null,
-              "range": [
-                36,
-                43
-              ],
+              "start": 36,
+              "end": 43,
               "loc": {
                 "start": {
                   "line": 3,
@@ -44,14 +90,13 @@
                   "column": 11
                 }
               },
+              "argument": null,
               "leadingComments": [
                 {
                   "type": "CommentBlock",
                   "value": " before ",
-                  "range": [
-                    19,
-                    31
-                  ],
+                  "start": 19,
+                  "end": 31,
                   "loc": {
                     "start": {
                       "line": 2,
@@ -61,17 +106,19 @@
                       "line": 2,
                       "column": 16
                     }
-                  }
+                  },
+                  "range": [
+                    19,
+                    31
+                  ]
                 }
               ],
               "trailingComments": [
                 {
                   "type": "CommentBlock",
                   "value": " after ",
-                  "range": [
-                    48,
-                    59
-                  ],
+                  "start": 48,
+                  "end": 59,
                   "loc": {
                     "start": {
                       "line": 4,
@@ -81,68 +128,25 @@
                       "line": 4,
                       "column": 15
                     }
-                  }
+                  },
+                  "range": [
+                    48,
+                    59
+                  ]
                 }
               ]
             }
-          ],
-          "range": [
-            13,
-            61
-          ],
-          "loc": {
-            "start": {
-              "line": 1,
-              "column": 13
-            },
-            "end": {
-              "line": 5,
-              "column": 1
-            }
-          }
-        },
-        "generator": false,
-        "expression": false,
-        "range": [
-          0,
-          61
-        ],
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 0
-          },
-          "end": {
-            "line": 5,
-            "column": 1
-          }
+          ]
         }
       }
-    ],
-    "sourceType": "script",
-    "range": [
-      0,
-      61
-    ],
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 5,
-        "column": 1
-      }
-    }
+    ]
   },
   "comments": [
     {
       "type": "CommentBlock",
       "value": " before ",
-      "range": [
-        19,
-        31
-      ],
+      "start": 19,
+      "end": 31,
       "loc": {
         "start": {
           "line": 2,
@@ -152,15 +156,17 @@
           "line": 2,
           "column": 16
         }
-      }
+      },
+      "range": [
+        19,
+        31
+      ]
     },
     {
       "type": "CommentBlock",
       "value": " after ",
-      "range": [
-        48,
-        59
-      ],
+      "start": 48,
+      "end": 59,
       "loc": {
         "start": {
           "line": 4,
@@ -170,7 +176,11 @@
           "line": 4,
           "column": 15
         }
-      }
+      },
+      "range": [
+        48,
+        59
+      ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/test/fixtures/comments/basic/surrounding-throw-comments/expected.json b/test/fixtures/comments/basic/surrounding-throw-comments/expected.json
index 3f822e9cd7..1d43e1eea5 100755
--- a/test/fixtures/comments/basic/surrounding-throw-comments/expected.json
+++ b/test/fixtures/comments/basic/surrounding-throw-comments/expected.json
@@ -1,17 +1,51 @@
 {
   "type": "File",
+  "start": 0,
+  "end": 63,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 5,
+      "column": 1
+    }
+  },
   "program": {
     "type": "Program",
+    "start": 0,
+    "end": 63,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 5,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
     "body": [
       {
         "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 63,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 5,
+            "column": 1
+          }
+        },
         "id": {
           "type": "Identifier",
-          "name": "a",
-          "range": [
-            9,
-            10
-          ],
+          "start": 9,
+          "end": 10,
           "loc": {
             "start": {
               "line": 1,
@@ -21,37 +55,31 @@
               "line": 1,
               "column": 10
             }
-          }
+          },
+          "name": "a"
         },
+        "generator": false,
+        "expression": false,
         "params": [],
         "body": {
           "type": "BlockStatement",
+          "start": 13,
+          "end": 63,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 13
+            },
+            "end": {
+              "line": 5,
+              "column": 1
+            }
+          },
           "body": [
             {
               "type": "ThrowStatement",
-              "argument": {
-                "type": "Literal",
-                "value": 55,
-                "raw": "55",
-                "range": [
-                  42,
-                  44
-                ],
-                "loc": {
-                  "start": {
-                    "line": 3,
-                    "column": 10
-                  },
-                  "end": {
-                    "line": 3,
-                    "column": 12
-                  }
-                }
-              },
-              "range": [
-                36,
-                45
-              ],
+              "start": 36,
+              "end": 45,
               "loc": {
                 "start": {
                   "line": 3,
@@ -62,14 +90,31 @@
                   "column": 13
                 }
               },
+              "argument": {
+                "type": "Literal",
+                "start": 42,
+                "end": 44,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 10
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 12
+                  }
+                },
+                "value": 55,
+                "rawValue": 55,
+                "raw": "55",
+                "leadingComments": null
+              },
               "leadingComments": [
                 {
                   "type": "CommentBlock",
                   "value": " before ",
-                  "range": [
-                    19,
-                    31
-                  ],
+                  "start": 19,
+                  "end": 31,
                   "loc": {
                     "start": {
                       "line": 2,
@@ -79,17 +124,19 @@
                       "line": 2,
                       "column": 16
                     }
-                  }
+                  },
+                  "range": [
+                    19,
+                    31
+                  ]
                 }
               ],
               "trailingComments": [
                 {
                   "type": "CommentBlock",
                   "value": " after ",
-                  "range": [
-                    50,
-                    61
-                  ],
+                  "start": 50,
+                  "end": 61,
                   "loc": {
                     "start": {
                       "line": 4,
@@ -99,68 +146,25 @@
                       "line": 4,
                       "column": 15
                     }
-                  }
+                  },
+                  "range": [
+                    50,
+                    61
+                  ]
                 }
               ]
             }
-          ],
-          "range": [
-            13,
-            63
-          ],
-          "loc": {
-            "start": {
-              "line": 1,
-              "column": 13
-            },
-            "end": {
-              "line": 5,
-              "column": 1
-            }
-          }
-        },
-        "generator": false,
-        "expression": false,
-        "range": [
-          0,
-          63
-        ],
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 0
-          },
-          "end": {
-            "line": 5,
-            "column": 1
-          }
+          ]
         }
       }
-    ],
-    "sourceType": "script",
-    "range": [
-      0,
-      63
-    ],
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 5,
-        "column": 1
-      }
-    }
+    ]
   },
   "comments": [
     {
       "type": "CommentBlock",
       "value": " before ",
-      "range": [
-        19,
-        31
-      ],
+      "start": 19,
+      "end": 31,
       "loc": {
         "start": {
           "line": 2,
@@ -170,15 +174,17 @@
           "line": 2,
           "column": 16
         }
-      }
+      },
+      "range": [
+        19,
+        31
+      ]
     },
     {
       "type": "CommentBlock",
       "value": " after ",
-      "range": [
-        50,
-        61
-      ],
+      "start": 50,
+      "end": 61,
       "loc": {
         "start": {
           "line": 4,
@@ -188,7 +194,11 @@
           "line": 4,
           "column": 15
         }
-      }
+      },
+      "range": [
+        50,
+        61
+      ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/test/fixtures/comments/basic/surrounding-while-loop-comments/expected.json b/test/fixtures/comments/basic/surrounding-while-loop-comments/expected.json
index e7063db08d..c749fccc76 100755
--- a/test/fixtures/comments/basic/surrounding-while-loop-comments/expected.json
+++ b/test/fixtures/comments/basic/surrounding-while-loop-comments/expected.json
@@ -1,17 +1,51 @@
 {
   "type": "File",
+  "start": 0,
+  "end": 68,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 68
+    }
+  },
   "program": {
     "type": "Program",
+    "start": 0,
+    "end": 68,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 68
+      }
+    },
+    "sourceType": "script",
     "body": [
       {
         "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 68,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 68
+          }
+        },
         "id": {
           "type": "Identifier",
-          "name": "f",
-          "range": [
-            9,
-            10
-          ],
+          "start": 9,
+          "end": 10,
           "loc": {
             "start": {
               "line": 1,
@@ -21,55 +55,31 @@
               "line": 1,
               "column": 10
             }
-          }
+          },
+          "name": "f"
         },
+        "generator": false,
+        "expression": false,
         "params": [],
         "body": {
           "type": "BlockStatement",
+          "start": 13,
+          "end": 68,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 13
+            },
+            "end": {
+              "line": 1,
+              "column": 68
+            }
+          },
           "body": [
             {
               "type": "WhileStatement",
-              "test": {
-                "type": "Literal",
-                "value": true,
-                "raw": "true",
-                "range": [
-                  37,
-                  41
-                ],
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 37
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 41
-                  }
-                }
-              },
-              "body": {
-                "type": "BlockStatement",
-                "body": [],
-                "range": [
-                  43,
-                  46
-                ],
-                "loc": {
-                  "start": {
-                    "line": 1,
-                    "column": 43
-                  },
-                  "end": {
-                    "line": 1,
-                    "column": 46
-                  }
-                }
-              },
-              "range": [
-                30,
-                46
-              ],
+              "start": 30,
+              "end": 46,
               "loc": {
                 "start": {
                   "line": 1,
@@ -80,14 +90,49 @@
                   "column": 46
                 }
               },
+              "test": {
+                "type": "Literal",
+                "start": 37,
+                "end": 41,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 37
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 41
+                  }
+                },
+                "value": true,
+                "rawValue": true,
+                "raw": "true",
+                "leadingComments": null
+              },
+              "body": {
+                "type": "BlockStatement",
+                "start": 43,
+                "end": 46,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 43
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 46
+                  }
+                },
+                "body": [],
+                "leadingComments": null,
+                "trailingComments": null
+              },
               "leadingComments": [
                 {
                   "type": "CommentBlock",
                   "value": " infinite ",
-                  "range": [
-                    15,
-                    29
-                  ],
+                  "start": 15,
+                  "end": 29,
                   "loc": {
                     "start": {
                       "line": 1,
@@ -97,17 +142,19 @@
                       "line": 1,
                       "column": 29
                     }
-                  }
+                  },
+                  "range": [
+                    15,
+                    29
+                  ]
                 }
               ],
               "trailingComments": [
                 {
                   "type": "CommentBlock",
                   "value": " bar ",
-                  "range": [
-                    47,
-                    56
-                  ],
+                  "start": 47,
+                  "end": 56,
                   "loc": {
                     "start": {
                       "line": 1,
@@ -117,55 +164,18 @@
                       "line": 1,
                       "column": 56
                     }
-                  }
+                  },
+                  "range": [
+                    47,
+                    56
+                  ]
                 }
               ]
             },
             {
               "type": "VariableDeclaration",
-              "declarations": [
-                {
-                  "type": "VariableDeclarator",
-                  "id": {
-                    "type": "Identifier",
-                    "name": "each",
-                    "range": [
-                      61,
-                      65
-                    ],
-                    "loc": {
-                      "start": {
-                        "line": 1,
-                        "column": 61
-                      },
-                      "end": {
-                        "line": 1,
-                        "column": 65
-                      }
-                    }
-                  },
-                  "init": null,
-                  "range": [
-                    61,
-                    65
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 1,
-                      "column": 61
-                    },
-                    "end": {
-                      "line": 1,
-                      "column": 65
-                    }
-                  }
-                }
-              ],
-              "kind": "var",
-              "range": [
-                57,
-                66
-              ],
+              "start": 57,
+              "end": 66,
               "loc": {
                 "start": {
                   "line": 1,
@@ -176,14 +186,49 @@
                   "column": 66
                 }
               },
+              "declarations": [
+                {
+                  "type": "VariableDeclarator",
+                  "start": 61,
+                  "end": 65,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 61
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 65
+                    }
+                  },
+                  "id": {
+                    "type": "Identifier",
+                    "start": 61,
+                    "end": 65,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 61
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 65
+                      }
+                    },
+                    "name": "each",
+                    "leadingComments": null
+                  },
+                  "init": null,
+                  "leadingComments": null
+                }
+              ],
+              "kind": "var",
               "leadingComments": [
                 {
                   "type": "CommentBlock",
                   "value": " bar ",
-                  "range": [
-                    47,
-                    56
-                  ],
+                  "start": 47,
+                  "end": 56,
                   "loc": {
                     "start": {
                       "line": 1,
@@ -193,68 +238,25 @@
                       "line": 1,
                       "column": 56
                     }
-                  }
+                  },
+                  "range": [
+                    47,
+                    56
+                  ]
                 }
               ]
             }
-          ],
-          "range": [
-            13,
-            68
-          ],
-          "loc": {
-            "start": {
-              "line": 1,
-              "column": 13
-            },
-            "end": {
-              "line": 1,
-              "column": 68
-            }
-          }
-        },
-        "generator": false,
-        "expression": false,
-        "range": [
-          0,
-          68
-        ],
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 0
-          },
-          "end": {
-            "line": 1,
-            "column": 68
-          }
+          ]
         }
       }
-    ],
-    "sourceType": "script",
-    "range": [
-      0,
-      68
-    ],
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 1,
-        "column": 68
-      }
-    }
+    ]
   },
   "comments": [
     {
       "type": "CommentBlock",
       "value": " infinite ",
-      "range": [
-        15,
-        29
-      ],
+      "start": 15,
+      "end": 29,
       "loc": {
         "start": {
           "line": 1,
@@ -264,15 +266,17 @@
           "line": 1,
           "column": 29
         }
-      }
+      },
+      "range": [
+        15,
+        29
+      ]
     },
     {
       "type": "CommentBlock",
       "value": " bar ",
-      "range": [
-        47,
-        56
-      ],
+      "start": 47,
+      "end": 56,
       "loc": {
         "start": {
           "line": 1,
@@ -282,7 +286,11 @@
           "line": 1,
           "column": 56
         }
-      }
+      },
+      "range": [
+        47,
+        56
+      ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/test/fixtures/comments/basic/switch-fallthrough-comment-in-function/expected.json b/test/fixtures/comments/basic/switch-fallthrough-comment-in-function/expected.json
index 5cab608d02..c53e024530 100755
--- a/test/fixtures/comments/basic/switch-fallthrough-comment-in-function/expected.json
+++ b/test/fixtures/comments/basic/switch-fallthrough-comment-in-function/expected.json
@@ -1,17 +1,51 @@
 {
   "type": "File",
+  "start": 0,
+  "end": 141,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 9,
+      "column": 1
+    }
+  },
   "program": {
     "type": "Program",
+    "start": 0,
+    "end": 141,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 9,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
     "body": [
       {
         "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 141,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 9,
+            "column": 1
+          }
+        },
         "id": {
           "type": "Identifier",
-          "name": "bar",
-          "range": [
-            9,
-            12
-          ],
+          "start": 9,
+          "end": 12,
           "loc": {
             "start": {
               "line": 1,
@@ -21,16 +55,16 @@
               "line": 1,
               "column": 12
             }
-          }
+          },
+          "name": "bar"
         },
+        "generator": false,
+        "expression": false,
         "params": [
           {
             "type": "Identifier",
-            "name": "foo",
-            "range": [
-              13,
-              16
-            ],
+            "start": 13,
+            "end": 16,
             "loc": {
               "start": {
                 "line": 1,
@@ -40,21 +74,43 @@
                 "line": 1,
                 "column": 16
               }
-            }
+            },
+            "name": "foo"
           }
         ],
         "body": {
           "type": "BlockStatement",
+          "start": 18,
+          "end": 141,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 18
+            },
+            "end": {
+              "line": 9,
+              "column": 1
+            }
+          },
           "body": [
             {
               "type": "SwitchStatement",
+              "start": 24,
+              "end": 139,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 4
+                },
+                "end": {
+                  "line": 8,
+                  "column": 5
+                }
+              },
               "discriminant": {
                 "type": "Identifier",
-                "name": "foo",
-                "range": [
-                  31,
-                  34
-                ],
+                "start": 31,
+                "end": 34,
                 "loc": {
                   "start": {
                     "line": 2,
@@ -64,35 +120,14 @@
                     "line": 2,
                     "column": 14
                   }
-                }
+                },
+                "name": "foo"
               },
               "cases": [
                 {
                   "type": "SwitchCase",
-                  "test": {
-                    "type": "Literal",
-                    "value": 1,
-                    "raw": "1",
-                    "range": [
-                      66,
-                      67
-                    ],
-                    "loc": {
-                      "start": {
-                        "line": 4,
-                        "column": 13
-                      },
-                      "end": {
-                        "line": 4,
-                        "column": 14
-                      }
-                    }
-                  },
-                  "consequent": [],
-                  "range": [
-                    61,
-                    68
-                  ],
+                  "start": 61,
+                  "end": 68,
                   "loc": {
                     "start": {
                       "line": 4,
@@ -103,14 +138,32 @@
                       "column": 15
                     }
                   },
+                  "consequent": [],
+                  "test": {
+                    "type": "Literal",
+                    "start": 66,
+                    "end": 67,
+                    "loc": {
+                      "start": {
+                        "line": 4,
+                        "column": 13
+                      },
+                      "end": {
+                        "line": 4,
+                        "column": 14
+                      }
+                    },
+                    "value": 1,
+                    "rawValue": 1,
+                    "raw": "1",
+                    "leadingComments": null
+                  },
                   "leadingComments": [
                     {
                       "type": "CommentLine",
                       "value": " foo",
-                      "range": [
-                        46,
-                        52
-                      ],
+                      "start": 46,
+                      "end": 52,
                       "loc": {
                         "start": {
                           "line": 3,
@@ -120,17 +173,19 @@
                           "line": 3,
                           "column": 14
                         }
-                      }
+                      },
+                      "range": [
+                        46,
+                        52
+                      ]
                     }
                   ],
                   "trailingComments": [
                     {
                       "type": "CommentLine",
                       "value": " falls through",
-                      "range": [
-                        81,
-                        97
-                      ],
+                      "start": 81,
+                      "end": 97,
                       "loc": {
                         "start": {
                           "line": 5,
@@ -140,90 +195,18 @@
                           "line": 5,
                           "column": 28
                         }
-                      }
+                      },
+                      "range": [
+                        81,
+                        97
+                      ]
                     }
                   ]
                 },
                 {
                   "type": "SwitchCase",
-                  "test": {
-                    "type": "Literal",
-                    "value": 2,
-                    "raw": "2",
-                    "range": [
-                      111,
-                      112
-                    ],
-                    "loc": {
-                      "start": {
-                        "line": 6,
-                        "column": 13
-                      },
-                      "end": {
-                        "line": 6,
-                        "column": 14
-                      }
-                    }
-                  },
-                  "consequent": [
-                    {
-                      "type": "ExpressionStatement",
-                      "expression": {
-                        "type": "CallExpression",
-                        "callee": {
-                          "type": "Identifier",
-                          "name": "doIt",
-                          "range": [
-                            126,
-                            130
-                          ],
-                          "loc": {
-                            "start": {
-                              "line": 7,
-                              "column": 12
-                            },
-                            "end": {
-                              "line": 7,
-                              "column": 16
-                            }
-                          }
-                        },
-                        "arguments": [],
-                        "range": [
-                          126,
-                          132
-                        ],
-                        "loc": {
-                          "start": {
-                            "line": 7,
-                            "column": 12
-                          },
-                          "end": {
-                            "line": 7,
-                            "column": 18
-                          }
-                        }
-                      },
-                      "range": [
-                        126,
-                        133
-                      ],
-                      "loc": {
-                        "start": {
-                          "line": 7,
-                          "column": 12
-                        },
-                        "end": {
-                          "line": 7,
-                          "column": 19
-                        }
-                      }
-                    }
-                  ],
-                  "range": [
-                    106,
-                    133
-                  ],
+                  "start": 106,
+                  "end": 133,
                   "loc": {
                     "start": {
                       "line": 6,
@@ -234,14 +217,80 @@
                       "column": 19
                     }
                   },
+                  "consequent": [
+                    {
+                      "type": "ExpressionStatement",
+                      "start": 126,
+                      "end": 133,
+                      "loc": {
+                        "start": {
+                          "line": 7,
+                          "column": 12
+                        },
+                        "end": {
+                          "line": 7,
+                          "column": 19
+                        }
+                      },
+                      "expression": {
+                        "type": "CallExpression",
+                        "start": 126,
+                        "end": 132,
+                        "loc": {
+                          "start": {
+                            "line": 7,
+                            "column": 12
+                          },
+                          "end": {
+                            "line": 7,
+                            "column": 18
+                          }
+                        },
+                        "callee": {
+                          "type": "Identifier",
+                          "start": 126,
+                          "end": 130,
+                          "loc": {
+                            "start": {
+                              "line": 7,
+                              "column": 12
+                            },
+                            "end": {
+                              "line": 7,
+                              "column": 16
+                            }
+                          },
+                          "name": "doIt"
+                        },
+                        "arguments": []
+                      }
+                    }
+                  ],
+                  "test": {
+                    "type": "Literal",
+                    "start": 111,
+                    "end": 112,
+                    "loc": {
+                      "start": {
+                        "line": 6,
+                        "column": 13
+                      },
+                      "end": {
+                        "line": 6,
+                        "column": 14
+                      }
+                    },
+                    "value": 2,
+                    "rawValue": 2,
+                    "raw": "2",
+                    "leadingComments": null
+                  },
                   "leadingComments": [
                     {
                       "type": "CommentLine",
                       "value": " falls through",
-                      "range": [
-                        81,
-                        97
-                      ],
+                      "start": 81,
+                      "end": 97,
                       "loc": {
                         "start": {
                           "line": 5,
@@ -251,84 +300,27 @@
                           "line": 5,
                           "column": 28
                         }
-                      }
+                      },
+                      "range": [
+                        81,
+                        97
+                      ]
                     }
                   ]
                 }
-              ],
-              "range": [
-                24,
-                139
-              ],
-              "loc": {
-                "start": {
-                  "line": 2,
-                  "column": 4
-                },
-                "end": {
-                  "line": 8,
-                  "column": 5
-                }
-              }
+              ]
             }
-          ],
-          "range": [
-            18,
-            141
-          ],
-          "loc": {
-            "start": {
-              "line": 1,
-              "column": 18
-            },
-            "end": {
-              "line": 9,
-              "column": 1
-            }
-          }
-        },
-        "generator": false,
-        "expression": false,
-        "range": [
-          0,
-          141
-        ],
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 0
-          },
-          "end": {
-            "line": 9,
-            "column": 1
-          }
+          ]
         }
       }
-    ],
-    "sourceType": "script",
-    "range": [
-      0,
-      141
-    ],
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 9,
-        "column": 1
-      }
-    }
+    ]
   },
   "comments": [
     {
       "type": "CommentLine",
       "value": " foo",
-      "range": [
-        46,
-        52
-      ],
+      "start": 46,
+      "end": 52,
       "loc": {
         "start": {
           "line": 3,
@@ -338,15 +330,17 @@
           "line": 3,
           "column": 14
         }
-      }
+      },
+      "range": [
+        46,
+        52
+      ]
     },
     {
       "type": "CommentLine",
       "value": " falls through",
-      "range": [
-        81,
-        97
-      ],
+      "start": 81,
+      "end": 97,
       "loc": {
         "start": {
           "line": 5,
@@ -356,7 +350,11 @@
           "line": 5,
           "column": 28
         }
-      }
+      },
+      "range": [
+        81,
+        97
+      ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/test/fixtures/comments/basic/switch-fallthrough-comment/expected.json b/test/fixtures/comments/basic/switch-fallthrough-comment/expected.json
index 6ace60329e..7bd86859b4 100755
--- a/test/fixtures/comments/basic/switch-fallthrough-comment/expected.json
+++ b/test/fixtures/comments/basic/switch-fallthrough-comment/expected.json
@@ -1,17 +1,51 @@
 {
   "type": "File",
+  "start": 0,
+  "end": 91,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 7,
+      "column": 1
+    }
+  },
   "program": {
     "type": "Program",
+    "start": 0,
+    "end": 91,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 7,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
     "body": [
       {
         "type": "SwitchStatement",
+        "start": 0,
+        "end": 91,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 7,
+            "column": 1
+          }
+        },
         "discriminant": {
           "type": "Identifier",
-          "name": "foo",
-          "range": [
-            7,
-            10
-          ],
+          "start": 7,
+          "end": 10,
           "loc": {
             "start": {
               "line": 1,
@@ -21,35 +55,14 @@
               "line": 1,
               "column": 10
             }
-          }
+          },
+          "name": "foo"
         },
         "cases": [
           {
             "type": "SwitchCase",
-            "test": {
-              "type": "Literal",
-              "value": 1,
-              "raw": "1",
-              "range": [
-                34,
-                35
-              ],
-              "loc": {
-                "start": {
-                  "line": 3,
-                  "column": 9
-                },
-                "end": {
-                  "line": 3,
-                  "column": 10
-                }
-              }
-            },
-            "consequent": [],
-            "range": [
-              29,
-              36
-            ],
+            "start": 29,
+            "end": 36,
             "loc": {
               "start": {
                 "line": 3,
@@ -60,14 +73,32 @@
                 "column": 11
               }
             },
+            "consequent": [],
+            "test": {
+              "type": "Literal",
+              "start": 34,
+              "end": 35,
+              "loc": {
+                "start": {
+                  "line": 3,
+                  "column": 9
+                },
+                "end": {
+                  "line": 3,
+                  "column": 10
+                }
+              },
+              "value": 1,
+              "rawValue": 1,
+              "raw": "1",
+              "leadingComments": null
+            },
             "leadingComments": [
               {
                 "type": "CommentLine",
                 "value": " foo",
-                "range": [
-                  18,
-                  24
-                ],
+                "start": 18,
+                "end": 24,
                 "loc": {
                   "start": {
                     "line": 2,
@@ -77,17 +108,19 @@
                     "line": 2,
                     "column": 10
                   }
-                }
+                },
+                "range": [
+                  18,
+                  24
+                ]
               }
             ],
             "trailingComments": [
               {
                 "type": "CommentLine",
                 "value": " falls through",
-                "range": [
-                  45,
-                  61
-                ],
+                "start": 45,
+                "end": 61,
                 "loc": {
                   "start": {
                     "line": 4,
@@ -97,90 +130,18 @@
                     "line": 4,
                     "column": 24
                   }
-                }
+                },
+                "range": [
+                  45,
+                  61
+                ]
               }
             ]
           },
           {
             "type": "SwitchCase",
-            "test": {
-              "type": "Literal",
-              "value": 2,
-              "raw": "2",
-              "range": [
-                71,
-                72
-              ],
-              "loc": {
-                "start": {
-                  "line": 5,
-                  "column": 9
-                },
-                "end": {
-                  "line": 5,
-                  "column": 10
-                }
-              }
-            },
-            "consequent": [
-              {
-                "type": "ExpressionStatement",
-                "expression": {
-                  "type": "CallExpression",
-                  "callee": {
-                    "type": "Identifier",
-                    "name": "doIt",
-                    "range": [
-                      82,
-                      86
-                    ],
-                    "loc": {
-                      "start": {
-                        "line": 6,
-                        "column": 8
-                      },
-                      "end": {
-                        "line": 6,
-                        "column": 12
-                      }
-                    }
-                  },
-                  "arguments": [],
-                  "range": [
-                    82,
-                    88
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 6,
-                      "column": 8
-                    },
-                    "end": {
-                      "line": 6,
-                      "column": 14
-                    }
-                  }
-                },
-                "range": [
-                  82,
-                  89
-                ],
-                "loc": {
-                  "start": {
-                    "line": 6,
-                    "column": 8
-                  },
-                  "end": {
-                    "line": 6,
-                    "column": 15
-                  }
-                }
-              }
-            ],
-            "range": [
-              66,
-              89
-            ],
+            "start": 66,
+            "end": 89,
             "loc": {
               "start": {
                 "line": 5,
@@ -191,14 +152,80 @@
                 "column": 15
               }
             },
+            "consequent": [
+              {
+                "type": "ExpressionStatement",
+                "start": 82,
+                "end": 89,
+                "loc": {
+                  "start": {
+                    "line": 6,
+                    "column": 8
+                  },
+                  "end": {
+                    "line": 6,
+                    "column": 15
+                  }
+                },
+                "expression": {
+                  "type": "CallExpression",
+                  "start": 82,
+                  "end": 88,
+                  "loc": {
+                    "start": {
+                      "line": 6,
+                      "column": 8
+                    },
+                    "end": {
+                      "line": 6,
+                      "column": 14
+                    }
+                  },
+                  "callee": {
+                    "type": "Identifier",
+                    "start": 82,
+                    "end": 86,
+                    "loc": {
+                      "start": {
+                        "line": 6,
+                        "column": 8
+                      },
+                      "end": {
+                        "line": 6,
+                        "column": 12
+                      }
+                    },
+                    "name": "doIt"
+                  },
+                  "arguments": []
+                }
+              }
+            ],
+            "test": {
+              "type": "Literal",
+              "start": 71,
+              "end": 72,
+              "loc": {
+                "start": {
+                  "line": 5,
+                  "column": 9
+                },
+                "end": {
+                  "line": 5,
+                  "column": 10
+                }
+              },
+              "value": 2,
+              "rawValue": 2,
+              "raw": "2",
+              "leadingComments": null
+            },
             "leadingComments": [
               {
                 "type": "CommentLine",
                 "value": " falls through",
-                "range": [
-                  45,
-                  61
-                ],
+                "start": 45,
+                "end": 61,
                 "loc": {
                   "start": {
                     "line": 4,
@@ -208,51 +235,24 @@
                     "line": 4,
                     "column": 24
                   }
-                }
+                },
+                "range": [
+                  45,
+                  61
+                ]
               }
             ]
           }
-        ],
-        "range": [
-          0,
-          91
-        ],
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 0
-          },
-          "end": {
-            "line": 7,
-            "column": 1
-          }
-        }
+        ]
       }
-    ],
-    "sourceType": "script",
-    "range": [
-      0,
-      91
-    ],
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 7,
-        "column": 1
-      }
-    }
+    ]
   },
   "comments": [
     {
       "type": "CommentLine",
       "value": " foo",
-      "range": [
-        18,
-        24
-      ],
+      "start": 18,
+      "end": 24,
       "loc": {
         "start": {
           "line": 2,
@@ -262,15 +262,17 @@
           "line": 2,
           "column": 10
         }
-      }
+      },
+      "range": [
+        18,
+        24
+      ]
     },
     {
       "type": "CommentLine",
       "value": " falls through",
-      "range": [
-        45,
-        61
-      ],
+      "start": 45,
+      "end": 61,
       "loc": {
         "start": {
           "line": 4,
@@ -280,7 +282,11 @@
           "line": 4,
           "column": 24
         }
-      }
+      },
+      "range": [
+        45,
+        61
+      ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/test/fixtures/comments/basic/switch-no-default-comment-in-function/expected.json b/test/fixtures/comments/basic/switch-no-default-comment-in-function/expected.json
index f7b3f3d310..e01a3fd11c 100755
--- a/test/fixtures/comments/basic/switch-no-default-comment-in-function/expected.json
+++ b/test/fixtures/comments/basic/switch-no-default-comment-in-function/expected.json
@@ -1,17 +1,51 @@
 {
   "type": "File",
+  "start": 0,
+  "end": 133,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 9,
+      "column": 1
+    }
+  },
   "program": {
     "type": "Program",
+    "start": 0,
+    "end": 133,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 9,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
     "body": [
       {
         "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 133,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 9,
+            "column": 1
+          }
+        },
         "id": {
           "type": "Identifier",
-          "name": "bar",
-          "range": [
-            9,
-            12
-          ],
+          "start": 9,
+          "end": 12,
           "loc": {
             "start": {
               "line": 1,
@@ -21,16 +55,16 @@
               "line": 1,
               "column": 12
             }
-          }
+          },
+          "name": "bar"
         },
+        "generator": false,
+        "expression": false,
         "params": [
           {
             "type": "Identifier",
-            "name": "a",
-            "range": [
-              13,
-              14
-            ],
+            "start": 13,
+            "end": 14,
             "loc": {
               "start": {
                 "line": 1,
@@ -40,21 +74,43 @@
                 "line": 1,
                 "column": 14
               }
-            }
+            },
+            "name": "a"
           }
         ],
         "body": {
           "type": "BlockStatement",
+          "start": 16,
+          "end": 133,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 16
+            },
+            "end": {
+              "line": 9,
+              "column": 1
+            }
+          },
           "body": [
             {
               "type": "SwitchStatement",
+              "start": 22,
+              "end": 131,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 4
+                },
+                "end": {
+                  "line": 8,
+                  "column": 5
+                }
+              },
               "discriminant": {
                 "type": "Identifier",
-                "name": "a",
-                "range": [
-                  30,
-                  31
-                ],
+                "start": 30,
+                "end": 31,
                 "loc": {
                   "start": {
                     "line": 2,
@@ -64,54 +120,14 @@
                     "line": 2,
                     "column": 13
                   }
-                }
+                },
+                "name": "a"
               },
               "cases": [
                 {
                   "type": "SwitchCase",
-                  "test": {
-                    "type": "Literal",
-                    "value": 2,
-                    "raw": "2",
-                    "range": [
-                      48,
-                      49
-                    ],
-                    "loc": {
-                      "start": {
-                        "line": 3,
-                        "column": 13
-                      },
-                      "end": {
-                        "line": 3,
-                        "column": 14
-                      }
-                    }
-                  },
-                  "consequent": [
-                    {
-                      "type": "BreakStatement",
-                      "label": null,
-                      "range": [
-                        63,
-                        69
-                      ],
-                      "loc": {
-                        "start": {
-                          "line": 4,
-                          "column": 12
-                        },
-                        "end": {
-                          "line": 4,
-                          "column": 18
-                        }
-                      }
-                    }
-                  ],
-                  "range": [
-                    43,
-                    69
-                  ],
+                  "start": 43,
+                  "end": 69,
                   "loc": {
                     "start": {
                       "line": 3,
@@ -121,53 +137,48 @@
                       "line": 4,
                       "column": 18
                     }
-                  }
-                },
-                {
-                  "type": "SwitchCase",
-                  "test": {
-                    "type": "Literal",
-                    "value": 1,
-                    "raw": "1",
-                    "range": [
-                      83,
-                      84
-                    ],
-                    "loc": {
-                      "start": {
-                        "line": 5,
-                        "column": 13
-                      },
-                      "end": {
-                        "line": 5,
-                        "column": 14
-                      }
-                    }
                   },
                   "consequent": [
                     {
                       "type": "BreakStatement",
-                      "label": null,
-                      "range": [
-                        98,
-                        104
-                      ],
+                      "start": 63,
+                      "end": 69,
                       "loc": {
                         "start": {
-                          "line": 6,
+                          "line": 4,
                           "column": 12
                         },
                         "end": {
-                          "line": 6,
+                          "line": 4,
                           "column": 18
                         }
-                      }
+                      },
+                      "label": null
                     }
                   ],
-                  "range": [
-                    78,
-                    104
-                  ],
+                  "test": {
+                    "type": "Literal",
+                    "start": 48,
+                    "end": 49,
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 13
+                      },
+                      "end": {
+                        "line": 3,
+                        "column": 14
+                      }
+                    },
+                    "value": 2,
+                    "rawValue": 2,
+                    "raw": "2"
+                  }
+                },
+                {
+                  "type": "SwitchCase",
+                  "start": 78,
+                  "end": 104,
                   "loc": {
                     "start": {
                       "line": 5,
@@ -178,14 +189,50 @@
                       "column": 18
                     }
                   },
+                  "consequent": [
+                    {
+                      "type": "BreakStatement",
+                      "start": 98,
+                      "end": 104,
+                      "loc": {
+                        "start": {
+                          "line": 6,
+                          "column": 12
+                        },
+                        "end": {
+                          "line": 6,
+                          "column": 18
+                        }
+                      },
+                      "label": null,
+                      "leadingComments": null,
+                      "trailingComments": null
+                    }
+                  ],
+                  "test": {
+                    "type": "Literal",
+                    "start": 83,
+                    "end": 84,
+                    "loc": {
+                      "start": {
+                        "line": 5,
+                        "column": 13
+                      },
+                      "end": {
+                        "line": 5,
+                        "column": 14
+                      }
+                    },
+                    "value": 1,
+                    "rawValue": 1,
+                    "raw": "1"
+                  },
                   "trailingComments": [
                     {
                       "type": "CommentLine",
                       "value": "no default",
-                      "range": [
-                        113,
-                        125
-                      ],
+                      "start": 113,
+                      "end": 125,
                       "loc": {
                         "start": {
                           "line": 7,
@@ -195,84 +242,27 @@
                           "line": 7,
                           "column": 20
                         }
-                      }
+                      },
+                      "range": [
+                        113,
+                        125
+                      ]
                     }
                   ]
                 }
-              ],
-              "range": [
-                22,
-                131
-              ],
-              "loc": {
-                "start": {
-                  "line": 2,
-                  "column": 4
-                },
-                "end": {
-                  "line": 8,
-                  "column": 5
-                }
-              }
+              ]
             }
-          ],
-          "range": [
-            16,
-            133
-          ],
-          "loc": {
-            "start": {
-              "line": 1,
-              "column": 16
-            },
-            "end": {
-              "line": 9,
-              "column": 1
-            }
-          }
-        },
-        "generator": false,
-        "expression": false,
-        "range": [
-          0,
-          133
-        ],
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 0
-          },
-          "end": {
-            "line": 9,
-            "column": 1
-          }
+          ]
         }
       }
-    ],
-    "sourceType": "script",
-    "range": [
-      0,
-      133
-    ],
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 9,
-        "column": 1
-      }
-    }
+    ]
   },
   "comments": [
     {
       "type": "CommentLine",
       "value": "no default",
-      "range": [
-        113,
-        125
-      ],
+      "start": 113,
+      "end": 125,
       "loc": {
         "start": {
           "line": 7,
@@ -282,7 +272,11 @@
           "line": 7,
           "column": 20
         }
-      }
+      },
+      "range": [
+        113,
+        125
+      ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/test/fixtures/comments/basic/switch-no-default-comment-in-nested-functions/expected.json b/test/fixtures/comments/basic/switch-no-default-comment-in-nested-functions/expected.json
index b8d4ea8ff3..2dbbec6d67 100755
--- a/test/fixtures/comments/basic/switch-no-default-comment-in-nested-functions/expected.json
+++ b/test/fixtures/comments/basic/switch-no-default-comment-in-nested-functions/expected.json
@@ -1,56 +1,66 @@
 {
   "type": "File",
+  "start": 0,
+  "end": 287,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 12,
+      "column": 2
+    }
+  },
   "program": {
     "type": "Program",
+    "start": 0,
+    "end": 287,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 12,
+        "column": 2
+      }
+    },
+    "sourceType": "script",
     "body": [
       {
         "type": "ExpressionStatement",
+        "start": 0,
+        "end": 287,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 12,
+            "column": 2
+          }
+        },
         "expression": {
           "type": "AssignmentExpression",
+          "start": 0,
+          "end": 286,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 12,
+              "column": 1
+            }
+          },
           "operator": "=",
           "left": {
             "type": "MemberExpression",
-            "computed": false,
-            "object": {
-              "type": "Identifier",
-              "name": "module",
-              "range": [
-                0,
-                6
-              ],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 0
-                },
-                "end": {
-                  "line": 1,
-                  "column": 6
-                }
-              }
-            },
-            "property": {
-              "type": "Identifier",
-              "name": "exports",
-              "range": [
-                7,
-                14
-              ],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 7
-                },
-                "end": {
-                  "line": 1,
-                  "column": 14
-                }
-              }
-            },
-            "range": [
-              0,
-              14
-            ],
+            "start": 0,
+            "end": 14,
             "loc": {
               "start": {
                 "line": 1,
@@ -60,19 +70,63 @@
                 "line": 1,
                 "column": 14
               }
-            }
+            },
+            "object": {
+              "type": "Identifier",
+              "start": 0,
+              "end": 6,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 0
+                },
+                "end": {
+                  "line": 1,
+                  "column": 6
+                }
+              },
+              "name": "module"
+            },
+            "property": {
+              "type": "Identifier",
+              "start": 7,
+              "end": 14,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 7
+                },
+                "end": {
+                  "line": 1,
+                  "column": 14
+                }
+              },
+              "name": "exports"
+            },
+            "computed": false
           },
           "right": {
             "type": "FunctionExpression",
+            "start": 17,
+            "end": 286,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 17
+              },
+              "end": {
+                "line": 12,
+                "column": 1
+              }
+            },
             "id": null,
+            "generator": false,
+            "expression": false,
             "params": [
               {
                 "type": "Identifier",
-                "name": "context",
-                "range": [
-                  26,
-                  33
-                ],
+                "start": 26,
+                "end": 33,
                 "loc": {
                   "start": {
                     "line": 1,
@@ -82,21 +136,43 @@
                     "line": 1,
                     "column": 33
                   }
-                }
+                },
+                "name": "context"
               }
             ],
             "body": {
               "type": "BlockStatement",
+              "start": 35,
+              "end": 286,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 35
+                },
+                "end": {
+                  "line": 12,
+                  "column": 1
+                }
+              },
               "body": [
                 {
                   "type": "FunctionDeclaration",
+                  "start": 42,
+                  "end": 283,
+                  "loc": {
+                    "start": {
+                      "line": 3,
+                      "column": 4
+                    },
+                    "end": {
+                      "line": 10,
+                      "column": 5
+                    }
+                  },
                   "id": {
                     "type": "Identifier",
-                    "name": "isConstant",
-                    "range": [
-                      51,
-                      61
-                    ],
+                    "start": 51,
+                    "end": 61,
                     "loc": {
                       "start": {
                         "line": 3,
@@ -106,16 +182,16 @@
                         "line": 3,
                         "column": 23
                       }
-                    }
+                    },
+                    "name": "isConstant"
                   },
+                  "generator": false,
+                  "expression": false,
                   "params": [
                     {
                       "type": "Identifier",
-                      "name": "node",
-                      "range": [
-                        62,
-                        66
-                      ],
+                      "start": 62,
+                      "end": 66,
                       "loc": {
                         "start": {
                           "line": 3,
@@ -125,57 +201,43 @@
                           "line": 3,
                           "column": 28
                         }
-                      }
+                      },
+                      "name": "node"
                     }
                   ],
                   "body": {
                     "type": "BlockStatement",
+                    "start": 68,
+                    "end": 283,
+                    "loc": {
+                      "start": {
+                        "line": 3,
+                        "column": 30
+                      },
+                      "end": {
+                        "line": 10,
+                        "column": 5
+                      }
+                    },
                     "body": [
                       {
                         "type": "SwitchStatement",
+                        "start": 78,
+                        "end": 255,
+                        "loc": {
+                          "start": {
+                            "line": 4,
+                            "column": 8
+                          },
+                          "end": {
+                            "line": 8,
+                            "column": 9
+                          }
+                        },
                         "discriminant": {
                           "type": "MemberExpression",
-                          "computed": false,
-                          "object": {
-                            "type": "Identifier",
-                            "name": "node",
-                            "range": [
-                              86,
-                              90
-                            ],
-                            "loc": {
-                              "start": {
-                                "line": 4,
-                                "column": 16
-                              },
-                              "end": {
-                                "line": 4,
-                                "column": 20
-                              }
-                            }
-                          },
-                          "property": {
-                            "type": "Identifier",
-                            "name": "type",
-                            "range": [
-                              91,
-                              95
-                            ],
-                            "loc": {
-                              "start": {
-                                "line": 4,
-                                "column": 21
-                              },
-                              "end": {
-                                "line": 4,
-                                "column": 25
-                              }
-                            }
-                          },
-                          "range": [
-                            86,
-                            95
-                          ],
+                          "start": 86,
+                          "end": 95,
                           "loc": {
                             "start": {
                               "line": 4,
@@ -185,289 +247,46 @@
                               "line": 4,
                               "column": 25
                             }
-                          }
+                          },
+                          "object": {
+                            "type": "Identifier",
+                            "start": 86,
+                            "end": 90,
+                            "loc": {
+                              "start": {
+                                "line": 4,
+                                "column": 16
+                              },
+                              "end": {
+                                "line": 4,
+                                "column": 20
+                              }
+                            },
+                            "name": "node"
+                          },
+                          "property": {
+                            "type": "Identifier",
+                            "start": 91,
+                            "end": 95,
+                            "loc": {
+                              "start": {
+                                "line": 4,
+                                "column": 21
+                              },
+                              "end": {
+                                "line": 4,
+                                "column": 25
+                              }
+                            },
+                            "name": "type"
+                          },
+                          "computed": false
                         },
                         "cases": [
                           {
                             "type": "SwitchCase",
-                            "test": {
-                              "type": "Literal",
-                              "value": "SequenceExpression",
-                              "raw": "\"SequenceExpression\"",
-                              "range": [
-                                116,
-                                136
-                              ],
-                              "loc": {
-                                "start": {
-                                  "line": 5,
-                                  "column": 17
-                                },
-                                "end": {
-                                  "line": 5,
-                                  "column": 37
-                                }
-                              }
-                            },
-                            "consequent": [
-                              {
-                                "type": "ReturnStatement",
-                                "argument": {
-                                  "type": "CallExpression",
-                                  "callee": {
-                                    "type": "Identifier",
-                                    "name": "isConstant",
-                                    "range": [
-                                      161,
-                                      171
-                                    ],
-                                    "loc": {
-                                      "start": {
-                                        "line": 6,
-                                        "column": 23
-                                      },
-                                      "end": {
-                                        "line": 6,
-                                        "column": 33
-                                      }
-                                    }
-                                  },
-                                  "arguments": [
-                                    {
-                                      "type": "MemberExpression",
-                                      "computed": true,
-                                      "object": {
-                                        "type": "MemberExpression",
-                                        "computed": false,
-                                        "object": {
-                                          "type": "Identifier",
-                                          "name": "node",
-                                          "range": [
-                                            172,
-                                            176
-                                          ],
-                                          "loc": {
-                                            "start": {
-                                              "line": 6,
-                                              "column": 34
-                                            },
-                                            "end": {
-                                              "line": 6,
-                                              "column": 38
-                                            }
-                                          }
-                                        },
-                                        "property": {
-                                          "type": "Identifier",
-                                          "name": "expressions",
-                                          "range": [
-                                            177,
-                                            188
-                                          ],
-                                          "loc": {
-                                            "start": {
-                                              "line": 6,
-                                              "column": 39
-                                            },
-                                            "end": {
-                                              "line": 6,
-                                              "column": 50
-                                            }
-                                          }
-                                        },
-                                        "range": [
-                                          172,
-                                          188
-                                        ],
-                                        "loc": {
-                                          "start": {
-                                            "line": 6,
-                                            "column": 34
-                                          },
-                                          "end": {
-                                            "line": 6,
-                                            "column": 50
-                                          }
-                                        }
-                                      },
-                                      "property": {
-                                        "type": "BinaryExpression",
-                                        "operator": "-",
-                                        "left": {
-                                          "type": "MemberExpression",
-                                          "computed": false,
-                                          "object": {
-                                            "type": "MemberExpression",
-                                            "computed": false,
-                                            "object": {
-                                              "type": "Identifier",
-                                              "name": "node",
-                                              "range": [
-                                                189,
-                                                193
-                                              ],
-                                              "loc": {
-                                                "start": {
-                                                  "line": 6,
-                                                  "column": 51
-                                                },
-                                                "end": {
-                                                  "line": 6,
-                                                  "column": 55
-                                                }
-                                              }
-                                            },
-                                            "property": {
-                                              "type": "Identifier",
-                                              "name": "expressions",
-                                              "range": [
-                                                194,
-                                                205
-                                              ],
-                                              "loc": {
-                                                "start": {
-                                                  "line": 6,
-                                                  "column": 56
-                                                },
-                                                "end": {
-                                                  "line": 6,
-                                                  "column": 67
-                                                }
-                                              }
-                                            },
-                                            "range": [
-                                              189,
-                                              205
-                                            ],
-                                            "loc": {
-                                              "start": {
-                                                "line": 6,
-                                                "column": 51
-                                              },
-                                              "end": {
-                                                "line": 6,
-                                                "column": 67
-                                              }
-                                            }
-                                          },
-                                          "property": {
-                                            "type": "Identifier",
-                                            "name": "length",
-                                            "range": [
-                                              206,
-                                              212
-                                            ],
-                                            "loc": {
-                                              "start": {
-                                                "line": 6,
-                                                "column": 68
-                                              },
-                                              "end": {
-                                                "line": 6,
-                                                "column": 74
-                                              }
-                                            }
-                                          },
-                                          "range": [
-                                            189,
-                                            212
-                                          ],
-                                          "loc": {
-                                            "start": {
-                                              "line": 6,
-                                              "column": 51
-                                            },
-                                            "end": {
-                                              "line": 6,
-                                              "column": 74
-                                            }
-                                          }
-                                        },
-                                        "right": {
-                                          "type": "Literal",
-                                          "value": 1,
-                                          "raw": "1",
-                                          "range": [
-                                            215,
-                                            216
-                                          ],
-                                          "loc": {
-                                            "start": {
-                                              "line": 6,
-                                              "column": 77
-                                            },
-                                            "end": {
-                                              "line": 6,
-                                              "column": 78
-                                            }
-                                          }
-                                        },
-                                        "range": [
-                                          189,
-                                          216
-                                        ],
-                                        "loc": {
-                                          "start": {
-                                            "line": 6,
-                                            "column": 51
-                                          },
-                                          "end": {
-                                            "line": 6,
-                                            "column": 78
-                                          }
-                                        }
-                                      },
-                                      "range": [
-                                        172,
-                                        217
-                                      ],
-                                      "loc": {
-                                        "start": {
-                                          "line": 6,
-                                          "column": 34
-                                        },
-                                        "end": {
-                                          "line": 6,
-                                          "column": 79
-                                        }
-                                      }
-                                    }
-                                  ],
-                                  "range": [
-                                    161,
-                                    218
-                                  ],
-                                  "loc": {
-                                    "start": {
-                                      "line": 6,
-                                      "column": 23
-                                    },
-                                    "end": {
-                                      "line": 6,
-                                      "column": 80
-                                    }
-                                  }
-                                },
-                                "range": [
-                                  154,
-                                  219
-                                ],
-                                "loc": {
-                                  "start": {
-                                    "line": 6,
-                                    "column": 16
-                                  },
-                                  "end": {
-                                    "line": 6,
-                                    "column": 81
-                                  }
-                                }
-                              }
-                            ],
-                            "range": [
-                              111,
-                              219
-                            ],
+                            "start": 111,
+                            "end": 219,
                             "loc": {
                               "start": {
                                 "line": 5,
@@ -478,14 +297,259 @@
                                 "column": 81
                               }
                             },
+                            "consequent": [
+                              {
+                                "type": "ReturnStatement",
+                                "start": 154,
+                                "end": 219,
+                                "loc": {
+                                  "start": {
+                                    "line": 6,
+                                    "column": 16
+                                  },
+                                  "end": {
+                                    "line": 6,
+                                    "column": 81
+                                  }
+                                },
+                                "argument": {
+                                  "type": "CallExpression",
+                                  "start": 161,
+                                  "end": 218,
+                                  "loc": {
+                                    "start": {
+                                      "line": 6,
+                                      "column": 23
+                                    },
+                                    "end": {
+                                      "line": 6,
+                                      "column": 80
+                                    }
+                                  },
+                                  "callee": {
+                                    "type": "Identifier",
+                                    "start": 161,
+                                    "end": 171,
+                                    "loc": {
+                                      "start": {
+                                        "line": 6,
+                                        "column": 23
+                                      },
+                                      "end": {
+                                        "line": 6,
+                                        "column": 33
+                                      }
+                                    },
+                                    "name": "isConstant"
+                                  },
+                                  "arguments": [
+                                    {
+                                      "type": "MemberExpression",
+                                      "start": 172,
+                                      "end": 217,
+                                      "loc": {
+                                        "start": {
+                                          "line": 6,
+                                          "column": 34
+                                        },
+                                        "end": {
+                                          "line": 6,
+                                          "column": 79
+                                        }
+                                      },
+                                      "object": {
+                                        "type": "MemberExpression",
+                                        "start": 172,
+                                        "end": 188,
+                                        "loc": {
+                                          "start": {
+                                            "line": 6,
+                                            "column": 34
+                                          },
+                                          "end": {
+                                            "line": 6,
+                                            "column": 50
+                                          }
+                                        },
+                                        "object": {
+                                          "type": "Identifier",
+                                          "start": 172,
+                                          "end": 176,
+                                          "loc": {
+                                            "start": {
+                                              "line": 6,
+                                              "column": 34
+                                            },
+                                            "end": {
+                                              "line": 6,
+                                              "column": 38
+                                            }
+                                          },
+                                          "name": "node"
+                                        },
+                                        "property": {
+                                          "type": "Identifier",
+                                          "start": 177,
+                                          "end": 188,
+                                          "loc": {
+                                            "start": {
+                                              "line": 6,
+                                              "column": 39
+                                            },
+                                            "end": {
+                                              "line": 6,
+                                              "column": 50
+                                            }
+                                          },
+                                          "name": "expressions"
+                                        },
+                                        "computed": false
+                                      },
+                                      "property": {
+                                        "type": "BinaryExpression",
+                                        "start": 189,
+                                        "end": 216,
+                                        "loc": {
+                                          "start": {
+                                            "line": 6,
+                                            "column": 51
+                                          },
+                                          "end": {
+                                            "line": 6,
+                                            "column": 78
+                                          }
+                                        },
+                                        "left": {
+                                          "type": "MemberExpression",
+                                          "start": 189,
+                                          "end": 212,
+                                          "loc": {
+                                            "start": {
+                                              "line": 6,
+                                              "column": 51
+                                            },
+                                            "end": {
+                                              "line": 6,
+                                              "column": 74
+                                            }
+                                          },
+                                          "object": {
+                                            "type": "MemberExpression",
+                                            "start": 189,
+                                            "end": 205,
+                                            "loc": {
+                                              "start": {
+                                                "line": 6,
+                                                "column": 51
+                                              },
+                                              "end": {
+                                                "line": 6,
+                                                "column": 67
+                                              }
+                                            },
+                                            "object": {
+                                              "type": "Identifier",
+                                              "start": 189,
+                                              "end": 193,
+                                              "loc": {
+                                                "start": {
+                                                  "line": 6,
+                                                  "column": 51
+                                                },
+                                                "end": {
+                                                  "line": 6,
+                                                  "column": 55
+                                                }
+                                              },
+                                              "name": "node"
+                                            },
+                                            "property": {
+                                              "type": "Identifier",
+                                              "start": 194,
+                                              "end": 205,
+                                              "loc": {
+                                                "start": {
+                                                  "line": 6,
+                                                  "column": 56
+                                                },
+                                                "end": {
+                                                  "line": 6,
+                                                  "column": 67
+                                                }
+                                              },
+                                              "name": "expressions"
+                                            },
+                                            "computed": false
+                                          },
+                                          "property": {
+                                            "type": "Identifier",
+                                            "start": 206,
+                                            "end": 212,
+                                            "loc": {
+                                              "start": {
+                                                "line": 6,
+                                                "column": 68
+                                              },
+                                              "end": {
+                                                "line": 6,
+                                                "column": 74
+                                              }
+                                            },
+                                            "name": "length"
+                                          },
+                                          "computed": false
+                                        },
+                                        "operator": "-",
+                                        "right": {
+                                          "type": "Literal",
+                                          "start": 215,
+                                          "end": 216,
+                                          "loc": {
+                                            "start": {
+                                              "line": 6,
+                                              "column": 77
+                                            },
+                                            "end": {
+                                              "line": 6,
+                                              "column": 78
+                                            }
+                                          },
+                                          "value": 1,
+                                          "rawValue": 1,
+                                          "raw": "1"
+                                        }
+                                      },
+                                      "computed": true
+                                    }
+                                  ]
+                                },
+                                "trailingComments": null
+                              }
+                            ],
+                            "test": {
+                              "type": "Literal",
+                              "start": 116,
+                              "end": 136,
+                              "loc": {
+                                "start": {
+                                  "line": 5,
+                                  "column": 17
+                                },
+                                "end": {
+                                  "line": 5,
+                                  "column": 37
+                                }
+                              },
+                              "value": "SequenceExpression",
+                              "rawValue": "SequenceExpression",
+                              "raw": "\"SequenceExpression\""
+                            },
                             "trailingComments": [
                               {
                                 "type": "CommentLine",
                                 "value": " no default",
-                                "range": [
-                                  232,
-                                  245
-                                ],
+                                "start": 232,
+                                "end": 245,
                                 "loc": {
                                   "start": {
                                     "line": 7,
@@ -495,51 +559,20 @@
                                     "line": 7,
                                     "column": 25
                                   }
-                                }
+                                },
+                                "range": [
+                                  232,
+                                  245
+                                ]
                               }
                             ]
                           }
-                        ],
-                        "range": [
-                          78,
-                          255
-                        ],
-                        "loc": {
-                          "start": {
-                            "line": 4,
-                            "column": 8
-                          },
-                          "end": {
-                            "line": 8,
-                            "column": 9
-                          }
-                        }
+                        ]
                       },
                       {
                         "type": "ReturnStatement",
-                        "argument": {
-                          "type": "Literal",
-                          "value": false,
-                          "raw": "false",
-                          "range": [
-                            271,
-                            276
-                          ],
-                          "loc": {
-                            "start": {
-                              "line": 9,
-                              "column": 15
-                            },
-                            "end": {
-                              "line": 9,
-                              "column": 20
-                            }
-                          }
-                        },
-                        "range": [
-                          264,
-                          277
-                        ],
+                        "start": 264,
+                        "end": 277,
                         "loc": {
                           "start": {
                             "line": 9,
@@ -550,14 +583,31 @@
                             "column": 21
                           }
                         },
+                        "argument": {
+                          "type": "Literal",
+                          "start": 271,
+                          "end": 276,
+                          "loc": {
+                            "start": {
+                              "line": 9,
+                              "column": 15
+                            },
+                            "end": {
+                              "line": 9,
+                              "column": 20
+                            }
+                          },
+                          "value": false,
+                          "rawValue": false,
+                          "raw": "false",
+                          "leadingComments": null
+                        },
                         "leadingComments": [
                           {
                             "type": "CommentLine",
                             "value": " no default",
-                            "range": [
-                              232,
-                              245
-                            ],
+                            "start": 232,
+                            "end": 245,
                             "loc": {
                               "start": {
                                 "line": 7,
@@ -567,131 +617,30 @@
                                 "line": 7,
                                 "column": 25
                               }
-                            }
+                            },
+                            "range": [
+                              232,
+                              245
+                            ]
                           }
                         ]
                       }
-                    ],
-                    "range": [
-                      68,
-                      283
-                    ],
-                    "loc": {
-                      "start": {
-                        "line": 3,
-                        "column": 30
-                      },
-                      "end": {
-                        "line": 10,
-                        "column": 5
-                      }
-                    }
-                  },
-                  "generator": false,
-                  "expression": false,
-                  "range": [
-                    42,
-                    283
-                  ],
-                  "loc": {
-                    "start": {
-                      "line": 3,
-                      "column": 4
-                    },
-                    "end": {
-                      "line": 10,
-                      "column": 5
-                    }
+                    ]
                   }
                 }
-              ],
-              "range": [
-                35,
-                286
-              ],
-              "loc": {
-                "start": {
-                  "line": 1,
-                  "column": 35
-                },
-                "end": {
-                  "line": 12,
-                  "column": 1
-                }
-              }
-            },
-            "generator": false,
-            "expression": false,
-            "range": [
-              17,
-              286
-            ],
-            "loc": {
-              "start": {
-                "line": 1,
-                "column": 17
-              },
-              "end": {
-                "line": 12,
-                "column": 1
-              }
+              ]
             }
-          },
-          "range": [
-            0,
-            286
-          ],
-          "loc": {
-            "start": {
-              "line": 1,
-              "column": 0
-            },
-            "end": {
-              "line": 12,
-              "column": 1
-            }
-          }
-        },
-        "range": [
-          0,
-          287
-        ],
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 0
-          },
-          "end": {
-            "line": 12,
-            "column": 2
           }
         }
       }
-    ],
-    "sourceType": "script",
-    "range": [
-      0,
-      287
-    ],
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 12,
-        "column": 2
-      }
-    }
+    ]
   },
   "comments": [
     {
       "type": "CommentLine",
       "value": " no default",
-      "range": [
-        232,
-        245
-      ],
+      "start": 232,
+      "end": 245,
       "loc": {
         "start": {
           "line": 7,
@@ -701,7 +650,11 @@
           "line": 7,
           "column": 25
         }
-      }
+      },
+      "range": [
+        232,
+        245
+      ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/test/fixtures/comments/basic/switch-no-default-comment/expected.json b/test/fixtures/comments/basic/switch-no-default-comment/expected.json
index 4d7734d285..a895f6dde3 100755
--- a/test/fixtures/comments/basic/switch-no-default-comment/expected.json
+++ b/test/fixtures/comments/basic/switch-no-default-comment/expected.json
@@ -1,17 +1,51 @@
 {
   "type": "File",
+  "start": 0,
+  "end": 58,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 5,
+      "column": 1
+    }
+  },
   "program": {
     "type": "Program",
+    "start": 0,
+    "end": 58,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 5,
+        "column": 1
+      }
+    },
+    "sourceType": "script",
     "body": [
       {
         "type": "SwitchStatement",
+        "start": 0,
+        "end": 58,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 5,
+            "column": 1
+          }
+        },
         "discriminant": {
           "type": "Identifier",
-          "name": "a",
-          "range": [
-            8,
-            9
-          ],
+          "start": 8,
+          "end": 9,
           "loc": {
             "start": {
               "line": 1,
@@ -21,54 +55,14 @@
               "line": 1,
               "column": 9
             }
-          }
+          },
+          "name": "a"
         },
         "cases": [
           {
             "type": "SwitchCase",
-            "test": {
-              "type": "Literal",
-              "value": 1,
-              "raw": "1",
-              "range": [
-                22,
-                23
-              ],
-              "loc": {
-                "start": {
-                  "line": 2,
-                  "column": 9
-                },
-                "end": {
-                  "line": 2,
-                  "column": 10
-                }
-              }
-            },
-            "consequent": [
-              {
-                "type": "BreakStatement",
-                "label": null,
-                "range": [
-                  33,
-                  39
-                ],
-                "loc": {
-                  "start": {
-                    "line": 3,
-                    "column": 8
-                  },
-                  "end": {
-                    "line": 3,
-                    "column": 14
-                  }
-                }
-              }
-            ],
-            "range": [
-              17,
-              39
-            ],
+            "start": 17,
+            "end": 39,
             "loc": {
               "start": {
                 "line": 2,
@@ -79,14 +73,50 @@
                 "column": 14
               }
             },
+            "consequent": [
+              {
+                "type": "BreakStatement",
+                "start": 33,
+                "end": 39,
+                "loc": {
+                  "start": {
+                    "line": 3,
+                    "column": 8
+                  },
+                  "end": {
+                    "line": 3,
+                    "column": 14
+                  }
+                },
+                "label": null,
+                "leadingComments": null,
+                "trailingComments": null
+              }
+            ],
+            "test": {
+              "type": "Literal",
+              "start": 22,
+              "end": 23,
+              "loc": {
+                "start": {
+                  "line": 2,
+                  "column": 9
+                },
+                "end": {
+                  "line": 2,
+                  "column": 10
+                }
+              },
+              "value": 1,
+              "rawValue": 1,
+              "raw": "1"
+            },
             "trailingComments": [
               {
                 "type": "CommentLine",
                 "value": "no default",
-                "range": [
-                  44,
-                  56
-                ],
+                "start": 44,
+                "end": 56,
                 "loc": {
                   "start": {
                     "line": 4,
@@ -96,51 +126,24 @@
                     "line": 4,
                     "column": 16
                   }
-                }
+                },
+                "range": [
+                  44,
+                  56
+                ]
               }
             ]
           }
-        ],
-        "range": [
-          0,
-          58
-        ],
-        "loc": {
-          "start": {
-            "line": 1,
-            "column": 0
-          },
-          "end": {
-            "line": 5,
-            "column": 1
-          }
-        }
+        ]
       }
-    ],
-    "sourceType": "script",
-    "range": [
-      0,
-      58
-    ],
-    "loc": {
-      "start": {
-        "line": 1,
-        "column": 0
-      },
-      "end": {
-        "line": 5,
-        "column": 1
-      }
-    }
+    ]
   },
   "comments": [
     {
       "type": "CommentLine",
       "value": "no default",
-      "range": [
-        44,
-        56
-      ],
+      "start": 44,
+      "end": 56,
       "loc": {
         "start": {
           "line": 4,
@@ -150,7 +153,11 @@
           "line": 4,
           "column": 16
         }
-      }
+      },
+      "range": [
+        44,
+        56
+      ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/test/fixtures/core/uncategorised/537/expected.json b/test/fixtures/core/uncategorised/537/expected.json
index bda1dbf787..7a71d52992 100644
--- a/test/fixtures/core/uncategorised/537/expected.json
+++ b/test/fixtures/core/uncategorised/537/expected.json
@@ -12,10 +12,6 @@
       "column": 19
     }
   },
-  "range": [
-    0,
-    19
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 19
       }
     },
-    "range": [
-      0,
-      19
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 19
           }
         },
-        "range": [
-          0,
-          19
-        ],
         "init": {
           "type": "VariableDeclaration",
           "start": 4,
@@ -68,10 +56,6 @@
               "column": 15
             }
           },
-          "range": [
-            4,
-            15
-          ],
           "declarations": [
             {
               "type": "VariableDeclarator",
@@ -87,10 +71,6 @@
                   "column": 15
                 }
               },
-              "range": [
-                10,
-                15
-              ],
               "id": {
                 "type": "Identifier",
                 "start": 10,
@@ -105,10 +85,6 @@
                     "column": 11
                   }
                 },
-                "range": [
-                  10,
-                  11
-                ],
                 "name": "x"
               },
               "init": {
@@ -125,10 +101,6 @@
                     "column": 15
                   }
                 },
-                "range": [
-                  14,
-                  15
-                ],
                 "value": 0,
                 "rawValue": 0,
                 "raw": "0"
@@ -152,13 +124,10 @@
               "line": 1,
               "column": 19
             }
-          },
-          "range": [
-            18,
-            19
-          ]
+          }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/experimental/uncategorised/26/expected.json b/test/fixtures/experimental/uncategorised/26/expected.json
index ecd65e95b9..04b1d89257 100644
--- a/test/fixtures/experimental/uncategorised/26/expected.json
+++ b/test/fixtures/experimental/uncategorised/26/expected.json
@@ -12,10 +12,6 @@
       "column": 20
     }
   },
-  "range": [
-    0,
-    20
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 20
       }
     },
-    "range": [
-      0,
-      20
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 20
           }
         },
-        "range": [
-          0,
-          20
-        ],
         "expression": {
           "type": "CallExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 20
             }
           },
-          "range": [
-            0,
-            20
-          ],
           "callee": {
             "type": "Identifier",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 1
               }
             },
-            "range": [
-              0,
-              1
-            ],
             "name": "f"
           },
           "arguments": [
@@ -107,10 +87,6 @@
                   "column": 3
                 }
               },
-              "range": [
-                2,
-                3
-              ],
               "name": "a"
             },
             {
@@ -127,10 +103,6 @@
                   "column": 16
                 }
               },
-              "range": [
-                5,
-                16
-              ],
               "callee": {
                 "type": "Identifier",
                 "start": 5,
@@ -145,10 +117,6 @@
                     "column": 10
                   }
                 },
-                "range": [
-                  5,
-                  10
-                ],
                 "name": "async"
               },
               "arguments": [
@@ -166,10 +134,6 @@
                       "column": 12
                     }
                   },
-                  "range": [
-                    11,
-                    12
-                  ],
                   "value": 1,
                   "rawValue": 1,
                   "raw": "1"
@@ -188,10 +152,6 @@
                       "column": 15
                     }
                   },
-                  "range": [
-                    14,
-                    15
-                  ],
                   "value": 2,
                   "rawValue": 2,
                   "raw": "2"
@@ -212,15 +172,12 @@
                   "column": 19
                 }
               },
-              "range": [
-                18,
-                19
-              ],
               "name": "b"
             }
           ]
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/experimental/uncategorised/27/expected.json b/test/fixtures/experimental/uncategorised/27/expected.json
index 7ab68c5779..235acc93f8 100644
--- a/test/fixtures/experimental/uncategorised/27/expected.json
+++ b/test/fixtures/experimental/uncategorised/27/expected.json
@@ -12,10 +12,6 @@
       "column": 17
     }
   },
-  "range": [
-    0,
-    17
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 17
       }
     },
-    "range": [
-      0,
-      17
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 17
           }
         },
-        "range": [
-          0,
-          17
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 17
               }
             },
-            "range": [
-              4,
-              17
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 6
                 }
               },
-              "range": [
-                4,
-                6
-              ],
               "name": "ok"
             },
             "init": {
@@ -107,10 +87,6 @@
                   "column": 17
                 }
               },
-              "range": [
-                9,
-                17
-              ],
               "callee": {
                 "type": "Identifier",
                 "start": 9,
@@ -125,10 +101,6 @@
                     "column": 14
                   }
                 },
-                "range": [
-                  9,
-                  14
-                ],
                 "name": "async"
               },
               "arguments": [
@@ -146,10 +118,6 @@
                       "column": 16
                     }
                   },
-                  "range": [
-                    15,
-                    16
-                  ],
                   "name": "x"
                 }
               ]
@@ -159,5 +127,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/experimental/uncategorised/28/expected.json b/test/fixtures/experimental/uncategorised/28/expected.json
index d5a6fc48de..2ac6e0d7d9 100644
--- a/test/fixtures/experimental/uncategorised/28/expected.json
+++ b/test/fixtures/experimental/uncategorised/28/expected.json
@@ -12,10 +12,6 @@
       "column": 38
     }
   },
-  "range": [
-    0,
-    38
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 38
       }
     },
-    "range": [
-      0,
-      38
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 38
           }
         },
-        "range": [
-          0,
-          38
-        ],
         "expression": {
           "type": "FunctionExpression",
           "start": 1,
@@ -68,10 +56,6 @@
               "column": 37
             }
           },
-          "range": [
-            1,
-            37
-          ],
           "id": null,
           "generator": false,
           "expression": false,
@@ -91,10 +75,6 @@
                 "column": 37
               }
             },
-            "range": [
-              12,
-              37
-            ],
             "body": [
               {
                 "type": "VariableDeclaration",
@@ -110,10 +90,6 @@
                     "column": 24
                   }
                 },
-                "range": [
-                  14,
-                  24
-                ],
                 "declarations": [
                   {
                     "type": "VariableDeclarator",
@@ -129,10 +105,6 @@
                         "column": 23
                       }
                     },
-                    "range": [
-                      18,
-                      23
-                    ],
                     "id": {
                       "type": "Identifier",
                       "start": 18,
@@ -147,10 +119,6 @@
                           "column": 23
                         }
                       },
-                      "range": [
-                        18,
-                        23
-                      ],
                       "name": "async"
                     },
                     "init": null
@@ -172,10 +140,6 @@
                     "column": 35
                   }
                 },
-                "range": [
-                  25,
-                  35
-                ],
                 "expression": {
                   "type": "AssignmentExpression",
                   "start": 25,
@@ -190,10 +154,6 @@
                       "column": 35
                     }
                   },
-                  "range": [
-                    25,
-                    35
-                  ],
                   "operator": "=",
                   "left": {
                     "type": "Identifier",
@@ -209,10 +169,6 @@
                         "column": 30
                       }
                     },
-                    "range": [
-                      25,
-                      30
-                    ],
                     "name": "async"
                   },
                   "right": {
@@ -229,10 +185,6 @@
                         "column": 35
                       }
                     },
-                    "range": [
-                      33,
-                      35
-                    ],
                     "value": 10,
                     "rawValue": 10,
                     "raw": "10"
@@ -245,5 +197,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/array-types/1/expected.json b/test/fixtures/flow/array-types/1/expected.json
index 4e440eea85..ec761b745f 100644
--- a/test/fixtures/flow/array-types/1/expected.json
+++ b/test/fixtures/flow/array-types/1/expected.json
@@ -12,10 +12,6 @@
       "column": 15
     }
   },
-  "range": [
-    0,
-    15
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 15
       }
     },
-    "range": [
-      0,
-      15
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 15
           }
         },
-        "range": [
-          0,
-          15
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 15
               }
             },
-            "range": [
-              4,
-              15
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 15
                 }
               },
-              "range": [
-                4,
-                15
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 15
                   }
                 },
-                "range": [
-                  5,
-                  15
-                ],
                 "typeAnnotation": {
                   "type": "ArrayTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 15
                     }
                   },
-                  "range": [
-                    7,
-                    15
-                  ],
                   "elementType": {
                     "type": "NumberTypeAnnotation",
                     "start": 7,
@@ -141,11 +113,7 @@
                         "line": 1,
                         "column": 13
                       }
-                    },
-                    "range": [
-                      7,
-                      13
-                    ]
+                    }
                   }
                 }
               }
@@ -156,5 +124,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/array-types/2/expected.json b/test/fixtures/flow/array-types/2/expected.json
index 5e5ae5b72e..1c35be8908 100644
--- a/test/fixtures/flow/array-types/2/expected.json
+++ b/test/fixtures/flow/array-types/2/expected.json
@@ -12,10 +12,6 @@
       "column": 16
     }
   },
-  "range": [
-    0,
-    16
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 16
       }
     },
-    "range": [
-      0,
-      16
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 16
           }
         },
-        "range": [
-          0,
-          16
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 16
               }
             },
-            "range": [
-              4,
-              16
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 16
                 }
               },
-              "range": [
-                4,
-                16
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 16
                   }
                 },
-                "range": [
-                  5,
-                  16
-                ],
                 "typeAnnotation": {
                   "type": "NullableTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 16
                     }
                   },
-                  "range": [
-                    7,
-                    16
-                  ],
                   "typeAnnotation": {
                     "type": "ArrayTypeAnnotation",
                     "start": 8,
@@ -142,10 +114,6 @@
                         "column": 16
                       }
                     },
-                    "range": [
-                      8,
-                      16
-                    ],
                     "elementType": {
                       "type": "NumberTypeAnnotation",
                       "start": 8,
@@ -159,11 +127,7 @@
                           "line": 1,
                           "column": 14
                         }
-                      },
-                      "range": [
-                        8,
-                        14
-                      ]
+                      }
                     }
                   }
                 }
@@ -175,5 +139,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/array-types/3/expected.json b/test/fixtures/flow/array-types/3/expected.json
index 5bb0bc53ec..3bc1a328ed 100644
--- a/test/fixtures/flow/array-types/3/expected.json
+++ b/test/fixtures/flow/array-types/3/expected.json
@@ -12,10 +12,6 @@
       "column": 18
     }
   },
-  "range": [
-    0,
-    18
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 18
       }
     },
-    "range": [
-      0,
-      18
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 18
           }
         },
-        "range": [
-          0,
-          18
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 18
               }
             },
-            "range": [
-              4,
-              18
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 18
                 }
               },
-              "range": [
-                4,
-                18
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 18
                   }
                 },
-                "range": [
-                  5,
-                  18
-                ],
                 "typeAnnotation": {
                   "type": "ArrayTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 18
                     }
                   },
-                  "range": [
-                    7,
-                    18
-                  ],
                   "elementType": {
                     "type": "NullableTypeAnnotation",
                     "start": 8,
@@ -142,10 +114,6 @@
                         "column": 15
                       }
                     },
-                    "range": [
-                      8,
-                      15
-                    ],
                     "typeAnnotation": {
                       "type": "NumberTypeAnnotation",
                       "start": 9,
@@ -159,11 +127,7 @@
                           "line": 1,
                           "column": 15
                         }
-                      },
-                      "range": [
-                        9,
-                        15
-                      ]
+                      }
                     }
                   }
                 }
@@ -175,5 +139,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/array-types/4/expected.json b/test/fixtures/flow/array-types/4/expected.json
index 6f14f7b527..9af2946b1c 100644
--- a/test/fixtures/flow/array-types/4/expected.json
+++ b/test/fixtures/flow/array-types/4/expected.json
@@ -12,10 +12,6 @@
       "column": 21
     }
   },
-  "range": [
-    0,
-    21
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 21
       }
     },
-    "range": [
-      0,
-      21
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 21
           }
         },
-        "range": [
-          0,
-          21
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 21
               }
             },
-            "range": [
-              4,
-              21
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 21
                 }
               },
-              "range": [
-                4,
-                21
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 21
                   }
                 },
-                "range": [
-                  5,
-                  21
-                ],
                 "typeAnnotation": {
                   "type": "FunctionTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 21
                     }
                   },
-                  "range": [
-                    7,
-                    21
-                  ],
                   "params": [],
                   "rest": null,
                   "returnType": {
@@ -144,10 +116,6 @@
                         "column": 21
                       }
                     },
-                    "range": [
-                      13,
-                      21
-                    ],
                     "elementType": {
                       "type": "NumberTypeAnnotation",
                       "start": 13,
@@ -161,11 +129,7 @@
                           "line": 1,
                           "column": 19
                         }
-                      },
-                      "range": [
-                        13,
-                        19
-                      ]
+                      }
                     }
                   },
                   "typeParameters": null
@@ -178,5 +142,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/array-types/5/expected.json b/test/fixtures/flow/array-types/5/expected.json
index 203a1a4220..3c6ed8b705 100644
--- a/test/fixtures/flow/array-types/5/expected.json
+++ b/test/fixtures/flow/array-types/5/expected.json
@@ -12,10 +12,6 @@
       "column": 23
     }
   },
-  "range": [
-    0,
-    23
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 23
       }
     },
-    "range": [
-      0,
-      23
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 23
           }
         },
-        "range": [
-          0,
-          23
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 23
               }
             },
-            "range": [
-              4,
-              23
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 23
                 }
               },
-              "range": [
-                4,
-                23
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 23
                   }
                 },
-                "range": [
-                  5,
-                  23
-                ],
                 "typeAnnotation": {
                   "type": "ArrayTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 23
                     }
                   },
-                  "range": [
-                    7,
-                    23
-                  ],
                   "elementType": {
                     "type": "FunctionTypeAnnotation",
                     "start": 8,
@@ -142,10 +114,6 @@
                         "column": 20
                       }
                     },
-                    "range": [
-                      8,
-                      20
-                    ],
                     "params": [],
                     "rest": null,
                     "returnType": {
@@ -161,11 +129,7 @@
                           "line": 1,
                           "column": 20
                         }
-                      },
-                      "range": [
-                        14,
-                        20
-                      ]
+                      }
                     },
                     "typeParameters": null
                   }
@@ -178,5 +142,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/array-types/6/expected.json b/test/fixtures/flow/array-types/6/expected.json
index bb49227b27..07cd5aeb7a 100644
--- a/test/fixtures/flow/array-types/6/expected.json
+++ b/test/fixtures/flow/array-types/6/expected.json
@@ -12,10 +12,6 @@
       "column": 17
     }
   },
-  "range": [
-    0,
-    17
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 17
       }
     },
-    "range": [
-      0,
-      17
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 17
           }
         },
-        "range": [
-          0,
-          17
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 17
               }
             },
-            "range": [
-              4,
-              17
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 17
                 }
               },
-              "range": [
-                4,
-                17
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 17
                   }
                 },
-                "range": [
-                  5,
-                  17
-                ],
                 "typeAnnotation": {
                   "type": "ArrayTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 17
                     }
                   },
-                  "range": [
-                    7,
-                    17
-                  ],
                   "elementType": {
                     "type": "TypeofTypeAnnotation",
                     "start": 7,
@@ -142,10 +114,6 @@
                         "column": 15
                       }
                     },
-                    "range": [
-                      7,
-                      15
-                    ],
                     "argument": {
                       "type": "GenericTypeAnnotation",
                       "start": 14,
@@ -160,10 +128,6 @@
                           "column": 15
                         }
                       },
-                      "range": [
-                        14,
-                        15
-                      ],
                       "typeParameters": null,
                       "id": {
                         "type": "Identifier",
@@ -179,10 +143,6 @@
                             "column": 15
                           }
                         },
-                        "range": [
-                          14,
-                          15
-                        ],
                         "name": "A"
                       }
                     }
@@ -196,5 +156,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/bounded-polymorphism/1/expected.json b/test/fixtures/flow/bounded-polymorphism/1/expected.json
index 595c54bddb..5b815db29e 100644
--- a/test/fixtures/flow/bounded-polymorphism/1/expected.json
+++ b/test/fixtures/flow/bounded-polymorphism/1/expected.json
@@ -12,10 +12,6 @@
       "column": 18
     }
   },
-  "range": [
-    0,
-    18
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 18
       }
     },
-    "range": [
-      0,
-      18
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 18
           }
         },
-        "range": [
-          0,
-          18
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 7
             }
           },
-          "range": [
-            6,
-            7
-          ],
           "name": "A"
         },
         "typeParameters": {
@@ -88,10 +72,6 @@
               "column": 15
             }
           },
-          "range": [
-            7,
-            15
-          ],
           "params": [
             {
               "type": "Identifier",
@@ -107,10 +87,6 @@
                   "column": 14
                 }
               },
-              "range": [
-                8,
-                14
-              ],
               "name": "T",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -126,10 +102,6 @@
                     "column": 14
                   }
                 },
-                "range": [
-                  9,
-                  14
-                ],
                 "typeAnnotation": {
                   "type": "GenericTypeAnnotation",
                   "start": 11,
@@ -144,10 +116,6 @@
                       "column": 14
                     }
                   },
-                  "range": [
-                    11,
-                    14
-                  ],
                   "typeParameters": null,
                   "id": {
                     "type": "Identifier",
@@ -163,10 +131,6 @@
                         "column": 14
                       }
                     },
-                    "range": [
-                      11,
-                      14
-                    ],
                     "name": "Foo"
                   }
                 }
@@ -189,13 +153,10 @@
               "column": 18
             }
           },
-          "range": [
-            16,
-            18
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/bounded-polymorphism/2/expected.json b/test/fixtures/flow/bounded-polymorphism/2/expected.json
index 960c7e01d3..8231ece78f 100644
--- a/test/fixtures/flow/bounded-polymorphism/2/expected.json
+++ b/test/fixtures/flow/bounded-polymorphism/2/expected.json
@@ -12,10 +12,6 @@
       "column": 29
     }
   },
-  "range": [
-    0,
-    29
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 29
       }
     },
-    "range": [
-      0,
-      29
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 29
           }
         },
-        "range": [
-          0,
-          29
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            9,
-            12
-          ],
           "name": "bar"
         },
         "generator": false,
@@ -91,10 +75,6 @@
               "column": 24
             }
           },
-          "range": [
-            12,
-            24
-          ],
           "params": [
             {
               "type": "Identifier",
@@ -110,10 +90,6 @@
                   "column": 23
                 }
               },
-              "range": [
-                13,
-                23
-              ],
               "name": "T",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -129,10 +105,6 @@
                     "column": 23
                   }
                 },
-                "range": [
-                  14,
-                  23
-                ],
                 "typeAnnotation": {
                   "type": "NullableTypeAnnotation",
                   "start": 16,
@@ -147,10 +119,6 @@
                       "column": 23
                     }
                   },
-                  "range": [
-                    16,
-                    23
-                  ],
                   "typeAnnotation": {
                     "type": "NumberTypeAnnotation",
                     "start": 17,
@@ -164,11 +132,7 @@
                         "line": 1,
                         "column": 23
                       }
-                    },
-                    "range": [
-                      17,
-                      23
-                    ]
+                    }
                   }
                 }
               }
@@ -190,13 +154,10 @@
               "column": 29
             }
           },
-          "range": [
-            27,
-            29
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/call-properties/1/expected.json b/test/fixtures/flow/call-properties/1/expected.json
index a771258acb..35b90b3c11 100644
--- a/test/fixtures/flow/call-properties/1/expected.json
+++ b/test/fixtures/flow/call-properties/1/expected.json
@@ -12,10 +12,6 @@
       "column": 22
     }
   },
-  "range": [
-    0,
-    22
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 22
       }
     },
-    "range": [
-      0,
-      22
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 22
           }
         },
-        "range": [
-          0,
-          22
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 22
               }
             },
-            "range": [
-              4,
-              22
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 22
                 }
               },
-              "range": [
-                4,
-                22
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 22
                   }
                 },
-                "range": [
-                  6,
-                  22
-                ],
                 "typeAnnotation": {
                   "type": "ObjectTypeAnnotation",
                   "start": 8,
@@ -124,10 +100,6 @@
                       "column": 22
                     }
                   },
-                  "range": [
-                    8,
-                    22
-                  ],
                   "callProperties": [
                     {
                       "type": "ObjectTypeCallProperty",
@@ -143,10 +115,6 @@
                           "column": 20
                         }
                       },
-                      "range": [
-                        10,
-                        20
-                      ],
                       "value": {
                         "type": "FunctionTypeAnnotation",
                         "start": 10,
@@ -161,10 +129,6 @@
                             "column": 20
                           }
                         },
-                        "range": [
-                          10,
-                          20
-                        ],
                         "params": [],
                         "rest": null,
                         "typeParameters": null,
@@ -181,11 +145,7 @@
                               "line": 1,
                               "column": 20
                             }
-                          },
-                          "range": [
-                            14,
-                            20
-                          ]
+                          }
                         }
                       }
                     }
@@ -201,5 +161,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/call-properties/2/expected.json b/test/fixtures/flow/call-properties/2/expected.json
index a52ef1b5b8..ddb97cd917 100644
--- a/test/fixtures/flow/call-properties/2/expected.json
+++ b/test/fixtures/flow/call-properties/2/expected.json
@@ -12,10 +12,6 @@
       "column": 23
     }
   },
-  "range": [
-    0,
-    23
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 23
       }
     },
-    "range": [
-      0,
-      23
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 23
           }
         },
-        "range": [
-          0,
-          23
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 23
               }
             },
-            "range": [
-              4,
-              23
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 23
                 }
               },
-              "range": [
-                4,
-                23
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 23
                   }
                 },
-                "range": [
-                  6,
-                  23
-                ],
                 "typeAnnotation": {
                   "type": "ObjectTypeAnnotation",
                   "start": 8,
@@ -124,10 +100,6 @@
                       "column": 23
                     }
                   },
-                  "range": [
-                    8,
-                    23
-                  ],
                   "callProperties": [
                     {
                       "type": "ObjectTypeCallProperty",
@@ -143,10 +115,6 @@
                           "column": 21
                         }
                       },
-                      "range": [
-                        10,
-                        21
-                      ],
                       "value": {
                         "type": "FunctionTypeAnnotation",
                         "start": 10,
@@ -161,10 +129,6 @@
                             "column": 20
                           }
                         },
-                        "range": [
-                          10,
-                          20
-                        ],
                         "params": [],
                         "rest": null,
                         "typeParameters": null,
@@ -181,11 +145,7 @@
                               "line": 1,
                               "column": 20
                             }
-                          },
-                          "range": [
-                            14,
-                            20
-                          ]
+                          }
                         }
                       }
                     }
@@ -201,5 +161,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/call-properties/3/expected.json b/test/fixtures/flow/call-properties/3/expected.json
index a10007ce45..10229e681d 100644
--- a/test/fixtures/flow/call-properties/3/expected.json
+++ b/test/fixtures/flow/call-properties/3/expected.json
@@ -12,10 +12,6 @@
       "column": 54
     }
   },
-  "range": [
-    0,
-    54
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 54
       }
     },
-    "range": [
-      0,
-      54
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 54
           }
         },
-        "range": [
-          0,
-          54
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 54
               }
             },
-            "range": [
-              4,
-              54
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 54
                 }
               },
-              "range": [
-                4,
-                54
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 54
                   }
                 },
-                "range": [
-                  6,
-                  54
-                ],
                 "typeAnnotation": {
                   "type": "ObjectTypeAnnotation",
                   "start": 8,
@@ -124,10 +100,6 @@
                       "column": 54
                     }
                   },
-                  "range": [
-                    8,
-                    54
-                  ],
                   "callProperties": [
                     {
                       "type": "ObjectTypeCallProperty",
@@ -143,10 +115,6 @@
                           "column": 21
                         }
                       },
-                      "range": [
-                        10,
-                        21
-                      ],
                       "value": {
                         "type": "FunctionTypeAnnotation",
                         "start": 10,
@@ -161,10 +129,6 @@
                             "column": 20
                           }
                         },
-                        "range": [
-                          10,
-                          20
-                        ],
                         "params": [],
                         "rest": null,
                         "typeParameters": null,
@@ -181,11 +145,7 @@
                               "line": 1,
                               "column": 20
                             }
-                          },
-                          "range": [
-                            14,
-                            20
-                          ]
+                          }
                         }
                       }
                     },
@@ -203,10 +163,6 @@
                           "column": 52
                         }
                       },
-                      "range": [
-                        33,
-                        52
-                      ],
                       "value": {
                         "type": "FunctionTypeAnnotation",
                         "start": 33,
@@ -221,10 +177,6 @@
                             "column": 52
                           }
                         },
-                        "range": [
-                          33,
-                          52
-                        ],
                         "params": [
                           {
                             "type": "FunctionTypeParam",
@@ -240,10 +192,6 @@
                                 "column": 43
                               }
                             },
-                            "range": [
-                              34,
-                              43
-                            ],
                             "name": {
                               "type": "Identifier",
                               "start": 34,
@@ -258,10 +206,6 @@
                                   "column": 35
                                 }
                               },
-                              "range": [
-                                34,
-                                35
-                              ],
                               "name": "x"
                             },
                             "optional": false,
@@ -278,11 +222,7 @@
                                   "line": 1,
                                   "column": 43
                                 }
-                              },
-                              "range": [
-                                37,
-                                43
-                              ]
+                              }
                             }
                           }
                         ],
@@ -301,11 +241,7 @@
                               "line": 1,
                               "column": 52
                             }
-                          },
-                          "range": [
-                            46,
-                            52
-                          ]
+                          }
                         }
                       }
                     }
@@ -325,10 +261,6 @@
                           "column": 32
                         }
                       },
-                      "range": [
-                        22,
-                        32
-                      ],
                       "key": {
                         "type": "Identifier",
                         "start": 22,
@@ -343,10 +275,6 @@
                             "column": 23
                           }
                         },
-                        "range": [
-                          22,
-                          23
-                        ],
                         "name": "y"
                       },
                       "value": {
@@ -362,11 +290,7 @@
                             "line": 1,
                             "column": 31
                           }
-                        },
-                        "range": [
-                          25,
-                          31
-                        ]
+                        }
                       },
                       "optional": false
                     }
@@ -381,5 +305,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/call-properties/4/expected.json b/test/fixtures/flow/call-properties/4/expected.json
index 8483776849..d92dba639f 100644
--- a/test/fixtures/flow/call-properties/4/expected.json
+++ b/test/fixtures/flow/call-properties/4/expected.json
@@ -12,10 +12,6 @@
       "column": 30
     }
   },
-  "range": [
-    0,
-    30
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 30
       }
     },
-    "range": [
-      0,
-      30
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 30
           }
         },
-        "range": [
-          0,
-          30
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 30
               }
             },
-            "range": [
-              4,
-              30
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 30
                 }
               },
-              "range": [
-                4,
-                30
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 30
                   }
                 },
-                "range": [
-                  6,
-                  30
-                ],
                 "typeAnnotation": {
                   "type": "ObjectTypeAnnotation",
                   "start": 8,
@@ -124,10 +100,6 @@
                       "column": 30
                     }
                   },
-                  "range": [
-                    8,
-                    30
-                  ],
                   "callProperties": [
                     {
                       "type": "ObjectTypeCallProperty",
@@ -143,10 +115,6 @@
                           "column": 28
                         }
                       },
-                      "range": [
-                        10,
-                        28
-                      ],
                       "value": {
                         "type": "FunctionTypeAnnotation",
                         "start": 10,
@@ -161,10 +129,6 @@
                             "column": 27
                           }
                         },
-                        "range": [
-                          10,
-                          27
-                        ],
                         "params": [
                           {
                             "type": "FunctionTypeParam",
@@ -180,10 +144,6 @@
                                 "column": 18
                               }
                             },
-                            "range": [
-                              14,
-                              18
-                            ],
                             "name": {
                               "type": "Identifier",
                               "start": 14,
@@ -198,10 +158,6 @@
                                   "column": 15
                                 }
                               },
-                              "range": [
-                                14,
-                                15
-                              ],
                               "name": "x"
                             },
                             "optional": false,
@@ -219,10 +175,6 @@
                                   "column": 18
                                 }
                               },
-                              "range": [
-                                17,
-                                18
-                              ],
                               "typeParameters": null,
                               "id": {
                                 "type": "Identifier",
@@ -238,10 +190,6 @@
                                     "column": 18
                                   }
                                 },
-                                "range": [
-                                  17,
-                                  18
-                                ],
                                 "name": "T"
                               }
                             }
@@ -262,10 +210,6 @@
                               "column": 13
                             }
                           },
-                          "range": [
-                            10,
-                            13
-                          ],
                           "params": [
                             {
                               "type": "Identifier",
@@ -281,10 +225,6 @@
                                   "column": 12
                                 }
                               },
-                              "range": [
-                                11,
-                                12
-                              ],
                               "name": "T"
                             }
                           ]
@@ -302,11 +242,7 @@
                               "line": 1,
                               "column": 27
                             }
-                          },
-                          "range": [
-                            21,
-                            27
-                          ]
+                          }
                         }
                       }
                     }
@@ -322,5 +258,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/call-properties/5/expected.json b/test/fixtures/flow/call-properties/5/expected.json
index 85f0a7d87e..4815e902bc 100644
--- a/test/fixtures/flow/call-properties/5/expected.json
+++ b/test/fixtures/flow/call-properties/5/expected.json
@@ -12,10 +12,6 @@
       "column": 27
     }
   },
-  "range": [
-    0,
-    27
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 27
       }
     },
-    "range": [
-      0,
-      27
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 27
           }
         },
-        "range": [
-          0,
-          27
-        ],
         "id": {
           "type": "Identifier",
           "start": 10,
@@ -68,10 +56,6 @@
               "column": 11
             }
           },
-          "range": [
-            10,
-            11
-          ],
           "name": "A"
         },
         "typeParameters": null,
@@ -90,10 +74,6 @@
               "column": 27
             }
           },
-          "range": [
-            12,
-            27
-          ],
           "callProperties": [
             {
               "type": "ObjectTypeCallProperty",
@@ -109,10 +89,6 @@
                   "column": 25
                 }
               },
-              "range": [
-                14,
-                25
-              ],
               "static": false,
               "value": {
                 "type": "FunctionTypeAnnotation",
@@ -128,10 +104,6 @@
                     "column": 24
                   }
                 },
-                "range": [
-                  14,
-                  24
-                ],
                 "params": [],
                 "rest": null,
                 "typeParameters": null,
@@ -148,11 +120,7 @@
                       "line": 1,
                       "column": 24
                     }
-                  },
-                  "range": [
-                    18,
-                    24
-                  ]
+                  }
                 }
               }
             }
@@ -162,5 +130,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/declare-module/1/expected.json b/test/fixtures/flow/declare-module/1/expected.json
index c83e3338cf..6c62e08565 100644
--- a/test/fixtures/flow/declare-module/1/expected.json
+++ b/test/fixtures/flow/declare-module/1/expected.json
@@ -12,10 +12,6 @@
       "column": 19
     }
   },
-  "range": [
-    0,
-    19
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 19
       }
     },
-    "range": [
-      0,
-      19
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 19
           }
         },
-        "range": [
-          0,
-          19
-        ],
         "id": {
           "type": "Identifier",
           "start": 15,
@@ -68,10 +56,6 @@
               "column": 16
             }
           },
-          "range": [
-            15,
-            16
-          ],
           "name": "A"
         },
         "body": {
@@ -88,13 +72,10 @@
               "column": 19
             }
           },
-          "range": [
-            17,
-            19
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/declare-module/2/expected.json b/test/fixtures/flow/declare-module/2/expected.json
index e165a24e7b..71ef4876cd 100644
--- a/test/fixtures/flow/declare-module/2/expected.json
+++ b/test/fixtures/flow/declare-module/2/expected.json
@@ -12,10 +12,6 @@
       "column": 28
     }
   },
-  "range": [
-    0,
-    28
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 28
       }
     },
-    "range": [
-      0,
-      28
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 28
           }
         },
-        "range": [
-          0,
-          28
-        ],
         "id": {
           "type": "Literal",
           "start": 15,
@@ -68,10 +56,6 @@
               "column": 25
             }
           },
-          "range": [
-            15,
-            25
-          ],
           "value": "./a/b.js",
           "rawValue": "./a/b.js",
           "raw": "\"./a/b.js\""
@@ -90,13 +74,10 @@
               "column": 28
             }
           },
-          "range": [
-            26,
-            28
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/declare-module/3/expected.json b/test/fixtures/flow/declare-module/3/expected.json
index 490f0eca8f..8654fdf948 100644
--- a/test/fixtures/flow/declare-module/3/expected.json
+++ b/test/fixtures/flow/declare-module/3/expected.json
@@ -12,10 +12,6 @@
       "column": 43
     }
   },
-  "range": [
-    0,
-    43
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 43
       }
     },
-    "range": [
-      0,
-      43
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 43
           }
         },
-        "range": [
-          0,
-          43
-        ],
         "id": {
           "type": "Identifier",
           "start": 15,
@@ -68,10 +56,6 @@
               "column": 16
             }
           },
-          "range": [
-            15,
-            16
-          ],
           "name": "A"
         },
         "body": {
@@ -88,10 +72,6 @@
               "column": 43
             }
           },
-          "range": [
-            17,
-            43
-          ],
           "body": [
             {
               "type": "DeclareVariable",
@@ -107,10 +87,6 @@
                   "column": 41
                 }
               },
-              "range": [
-                19,
-                41
-              ],
               "id": {
                 "type": "Identifier",
                 "start": 31,
@@ -125,10 +101,6 @@
                     "column": 40
                   }
                 },
-                "range": [
-                  31,
-                  40
-                ],
                 "name": "x",
                 "typeAnnotation": {
                   "type": "TypeAnnotation",
@@ -144,10 +116,6 @@
                       "column": 40
                     }
                   },
-                  "range": [
-                    32,
-                    40
-                  ],
                   "typeAnnotation": {
                     "type": "NumberTypeAnnotation",
                     "start": 34,
@@ -161,11 +129,7 @@
                         "line": 1,
                         "column": 40
                       }
-                    },
-                    "range": [
-                      34,
-                      40
-                    ]
+                    }
                   }
                 }
               }
@@ -174,5 +138,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/declare-module/4/expected.json b/test/fixtures/flow/declare-module/4/expected.json
index 5a11624484..e53817230a 100644
--- a/test/fixtures/flow/declare-module/4/expected.json
+++ b/test/fixtures/flow/declare-module/4/expected.json
@@ -12,10 +12,6 @@
       "column": 52
     }
   },
-  "range": [
-    0,
-    52
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 52
       }
     },
-    "range": [
-      0,
-      52
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 52
           }
         },
-        "range": [
-          0,
-          52
-        ],
         "id": {
           "type": "Identifier",
           "start": 15,
@@ -68,10 +56,6 @@
               "column": 16
             }
           },
-          "range": [
-            15,
-            16
-          ],
           "name": "A"
         },
         "body": {
@@ -88,10 +72,6 @@
               "column": 52
             }
           },
-          "range": [
-            17,
-            52
-          ],
           "body": [
             {
               "type": "DeclareFunction",
@@ -107,10 +87,6 @@
                   "column": 50
                 }
               },
-              "range": [
-                19,
-                50
-              ],
               "id": {
                 "type": "Identifier",
                 "start": 36,
@@ -125,10 +101,6 @@
                     "column": 49
                   }
                 },
-                "range": [
-                  36,
-                  49
-                ],
                 "name": "foo",
                 "typeAnnotation": {
                   "type": "TypeAnnotation",
@@ -144,10 +116,6 @@
                       "column": 49
                     }
                   },
-                  "range": [
-                    39,
-                    49
-                  ],
                   "typeAnnotation": {
                     "type": "FunctionTypeAnnotation",
                     "start": 39,
@@ -162,10 +130,6 @@
                         "column": 49
                       }
                     },
-                    "range": [
-                      39,
-                      49
-                    ],
                     "typeParameters": null,
                     "params": [],
                     "rest": null,
@@ -182,11 +146,7 @@
                           "line": 1,
                           "column": 49
                         }
-                      },
-                      "range": [
-                        43,
-                        49
-                      ]
+                      }
                     }
                   }
                 }
@@ -196,5 +156,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/declare-module/5/expected.json b/test/fixtures/flow/declare-module/5/expected.json
index 8053dba193..5da254c476 100644
--- a/test/fixtures/flow/declare-module/5/expected.json
+++ b/test/fixtures/flow/declare-module/5/expected.json
@@ -12,10 +12,6 @@
       "column": 55
     }
   },
-  "range": [
-    0,
-    55
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 55
       }
     },
-    "range": [
-      0,
-      55
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 55
           }
         },
-        "range": [
-          0,
-          55
-        ],
         "id": {
           "type": "Identifier",
           "start": 15,
@@ -68,10 +56,6 @@
               "column": 16
             }
           },
-          "range": [
-            15,
-            16
-          ],
           "name": "A"
         },
         "body": {
@@ -88,10 +72,6 @@
               "column": 55
             }
           },
-          "range": [
-            17,
-            55
-          ],
           "body": [
             {
               "type": "DeclareClass",
@@ -107,10 +87,6 @@
                   "column": 53
                 }
               },
-              "range": [
-                19,
-                53
-              ],
               "id": {
                 "type": "Identifier",
                 "start": 33,
@@ -125,10 +101,6 @@
                     "column": 34
                   }
                 },
-                "range": [
-                  33,
-                  34
-                ],
                 "name": "B"
               },
               "typeParameters": null,
@@ -147,10 +119,6 @@
                     "column": 53
                   }
                 },
-                "range": [
-                  35,
-                  53
-                ],
                 "callProperties": [],
                 "properties": [
                   {
@@ -167,10 +135,6 @@
                         "column": 51
                       }
                     },
-                    "range": [
-                      37,
-                      51
-                    ],
                     "value": {
                       "type": "FunctionTypeAnnotation",
                       "start": 37,
@@ -185,10 +149,6 @@
                           "column": 50
                         }
                       },
-                      "range": [
-                        37,
-                        50
-                      ],
                       "params": [],
                       "rest": null,
                       "typeParameters": null,
@@ -205,11 +165,7 @@
                             "line": 1,
                             "column": 50
                           }
-                        },
-                        "range": [
-                          44,
-                          50
-                        ]
+                        }
                       }
                     },
                     "key": {
@@ -226,10 +182,6 @@
                           "column": 40
                         }
                       },
-                      "range": [
-                        37,
-                        40
-                      ],
                       "name": "foo"
                     },
                     "optional": false
@@ -242,5 +194,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/declare-statements/1/expected.json b/test/fixtures/flow/declare-statements/1/expected.json
index e30c131e56..c09b84fcf9 100644
--- a/test/fixtures/flow/declare-statements/1/expected.json
+++ b/test/fixtures/flow/declare-statements/1/expected.json
@@ -12,10 +12,6 @@
       "column": 15
     }
   },
-  "range": [
-    0,
-    15
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 15
       }
     },
-    "range": [
-      0,
-      15
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 15
           }
         },
-        "range": [
-          0,
-          15
-        ],
         "id": {
           "type": "Identifier",
           "start": 12,
@@ -68,13 +56,10 @@
               "column": 15
             }
           },
-          "range": [
-            12,
-            15
-          ],
           "name": "foo"
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/declare-statements/10/expected.json b/test/fixtures/flow/declare-statements/10/expected.json
index b5883ad291..ef044f87af 100644
--- a/test/fixtures/flow/declare-statements/10/expected.json
+++ b/test/fixtures/flow/declare-statements/10/expected.json
@@ -12,10 +12,6 @@
       "column": 59
     }
   },
-  "range": [
-    0,
-    59
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 59
       }
     },
-    "range": [
-      0,
-      59
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 59
           }
         },
-        "range": [
-          0,
-          59
-        ],
         "id": {
           "type": "Identifier",
           "start": 14,
@@ -68,10 +56,6 @@
               "column": 15
             }
           },
-          "range": [
-            14,
-            15
-          ],
           "name": "A"
         },
         "typeParameters": null,
@@ -90,10 +74,6 @@
               "column": 59
             }
           },
-          "range": [
-            16,
-            59
-          ],
           "callProperties": [],
           "properties": [
             {
@@ -110,10 +90,6 @@
                   "column": 39
                 }
               },
-              "range": [
-                18,
-                39
-              ],
               "value": {
                 "type": "FunctionTypeAnnotation",
                 "start": 18,
@@ -128,10 +104,6 @@
                     "column": 38
                   }
                 },
-                "range": [
-                  18,
-                  38
-                ],
                 "params": [],
                 "rest": null,
                 "typeParameters": null,
@@ -148,11 +120,7 @@
                       "line": 1,
                       "column": 38
                     }
-                  },
-                  "range": [
-                    32,
-                    38
-                  ]
+                  }
                 }
               },
               "static": true,
@@ -170,10 +138,6 @@
                     "column": 28
                   }
                 },
-                "range": [
-                  25,
-                  28
-                ],
                 "name": "foo"
               },
               "optional": false
@@ -192,10 +156,6 @@
                   "column": 57
                 }
               },
-              "range": [
-                40,
-                57
-              ],
               "key": {
                 "type": "Identifier",
                 "start": 47,
@@ -210,10 +170,6 @@
                     "column": 48
                   }
                 },
-                "range": [
-                  47,
-                  48
-                ],
                 "name": "x"
               },
               "value": {
@@ -229,11 +185,7 @@
                     "line": 1,
                     "column": 57
                   }
-                },
-                "range": [
-                  51,
-                  57
-                ]
+                }
               },
               "optional": false,
               "static": true
@@ -243,5 +195,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/declare-statements/11/expected.json b/test/fixtures/flow/declare-statements/11/expected.json
index 59b89aa16f..8756ca2a0c 100644
--- a/test/fixtures/flow/declare-statements/11/expected.json
+++ b/test/fixtures/flow/declare-statements/11/expected.json
@@ -12,10 +12,6 @@
       "column": 53
     }
   },
-  "range": [
-    0,
-    53
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 53
       }
     },
-    "range": [
-      0,
-      53
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 53
           }
         },
-        "range": [
-          0,
-          53
-        ],
         "id": {
           "type": "Identifier",
           "start": 14,
@@ -68,10 +56,6 @@
               "column": 15
             }
           },
-          "range": [
-            14,
-            15
-          ],
           "name": "A"
         },
         "typeParameters": null,
@@ -90,10 +74,6 @@
               "column": 53
             }
           },
-          "range": [
-            16,
-            53
-          ],
           "callProperties": [],
           "properties": [],
           "indexers": [
@@ -111,10 +91,6 @@
                   "column": 51
                 }
               },
-              "range": [
-                18,
-                51
-              ],
               "static": true,
               "id": {
                 "type": "Identifier",
@@ -130,10 +106,6 @@
                     "column": 34
                   }
                 },
-                "range": [
-                  27,
-                  34
-                ],
                 "name": "indexer"
               },
               "key": {
@@ -149,11 +121,7 @@
                     "line": 1,
                     "column": 42
                   }
-                },
-                "range": [
-                  36,
-                  42
-                ]
+                }
               },
               "value": {
                 "type": "StringTypeAnnotation",
@@ -168,16 +136,13 @@
                     "line": 1,
                     "column": 51
                   }
-                },
-                "range": [
-                  45,
-                  51
-                ]
+                }
               }
             }
           ]
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/declare-statements/12/expected.json b/test/fixtures/flow/declare-statements/12/expected.json
index 04f75f12a1..5ff774491c 100644
--- a/test/fixtures/flow/declare-statements/12/expected.json
+++ b/test/fixtures/flow/declare-statements/12/expected.json
@@ -12,10 +12,6 @@
       "column": 38
     }
   },
-  "range": [
-    0,
-    38
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 38
       }
     },
-    "range": [
-      0,
-      38
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 38
           }
         },
-        "range": [
-          0,
-          38
-        ],
         "id": {
           "type": "Identifier",
           "start": 14,
@@ -68,10 +56,6 @@
               "column": 15
             }
           },
-          "range": [
-            14,
-            15
-          ],
           "name": "A"
         },
         "typeParameters": null,
@@ -90,10 +74,6 @@
               "column": 38
             }
           },
-          "range": [
-            16,
-            38
-          ],
           "callProperties": [
             {
               "type": "ObjectTypeCallProperty",
@@ -109,10 +89,6 @@
                   "column": 36
                 }
               },
-              "range": [
-                18,
-                36
-              ],
               "static": true,
               "value": {
                 "type": "FunctionTypeAnnotation",
@@ -128,10 +104,6 @@
                     "column": 36
                   }
                 },
-                "range": [
-                  25,
-                  36
-                ],
                 "params": [],
                 "rest": null,
                 "typeParameters": null,
@@ -148,11 +120,7 @@
                       "line": 1,
                       "column": 36
                     }
-                  },
-                  "range": [
-                    30,
-                    36
-                  ]
+                  }
                 }
               }
             }
@@ -162,5 +130,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/declare-statements/2/expected.json b/test/fixtures/flow/declare-statements/2/expected.json
index baa6d5aca5..bed757d73f 100644
--- a/test/fixtures/flow/declare-statements/2/expected.json
+++ b/test/fixtures/flow/declare-statements/2/expected.json
@@ -12,10 +12,6 @@
       "column": 16
     }
   },
-  "range": [
-    0,
-    16
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 16
       }
     },
-    "range": [
-      0,
-      16
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 16
           }
         },
-        "range": [
-          0,
-          16
-        ],
         "id": {
           "type": "Identifier",
           "start": 12,
@@ -68,13 +56,10 @@
               "column": 15
             }
           },
-          "range": [
-            12,
-            15
-          ],
           "name": "foo"
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/declare-statements/3/expected.json b/test/fixtures/flow/declare-statements/3/expected.json
index 11ef786df6..f77a398e93 100644
--- a/test/fixtures/flow/declare-statements/3/expected.json
+++ b/test/fixtures/flow/declare-statements/3/expected.json
@@ -12,10 +12,6 @@
       "column": 28
     }
   },
-  "range": [
-    0,
-    28
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 28
       }
     },
-    "range": [
-      0,
-      28
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 28
           }
         },
-        "range": [
-          0,
-          28
-        ],
         "id": {
           "type": "Identifier",
           "start": 17,
@@ -68,10 +56,6 @@
               "column": 28
             }
           },
-          "range": [
-            17,
-            28
-          ],
           "name": "foo",
           "typeAnnotation": {
             "type": "TypeAnnotation",
@@ -87,10 +71,6 @@
                 "column": 28
               }
             },
-            "range": [
-              20,
-              28
-            ],
             "typeAnnotation": {
               "type": "FunctionTypeAnnotation",
               "start": 20,
@@ -105,10 +85,6 @@
                   "column": 28
                 }
               },
-              "range": [
-                20,
-                28
-              ],
               "typeParameters": null,
               "params": [],
               "rest": null,
@@ -125,16 +101,13 @@
                     "line": 1,
                     "column": 28
                   }
-                },
-                "range": [
-                  24,
-                  28
-                ]
+                }
               }
             }
           }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/declare-statements/4/expected.json b/test/fixtures/flow/declare-statements/4/expected.json
index a7f204c966..f5aaaa9224 100644
--- a/test/fixtures/flow/declare-statements/4/expected.json
+++ b/test/fixtures/flow/declare-statements/4/expected.json
@@ -12,10 +12,6 @@
       "column": 29
     }
   },
-  "range": [
-    0,
-    29
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 29
       }
     },
-    "range": [
-      0,
-      29
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 29
           }
         },
-        "range": [
-          0,
-          29
-        ],
         "id": {
           "type": "Identifier",
           "start": 17,
@@ -68,10 +56,6 @@
               "column": 28
             }
           },
-          "range": [
-            17,
-            28
-          ],
           "name": "foo",
           "typeAnnotation": {
             "type": "TypeAnnotation",
@@ -87,10 +71,6 @@
                 "column": 28
               }
             },
-            "range": [
-              20,
-              28
-            ],
             "typeAnnotation": {
               "type": "FunctionTypeAnnotation",
               "start": 20,
@@ -105,10 +85,6 @@
                   "column": 28
                 }
               },
-              "range": [
-                20,
-                28
-              ],
               "typeParameters": null,
               "params": [],
               "rest": null,
@@ -125,16 +101,13 @@
                     "line": 1,
                     "column": 28
                   }
-                },
-                "range": [
-                  24,
-                  28
-                ]
+                }
               }
             }
           }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/declare-statements/5/expected.json b/test/fixtures/flow/declare-statements/5/expected.json
index ce61c208d4..860eca7ba5 100644
--- a/test/fixtures/flow/declare-statements/5/expected.json
+++ b/test/fixtures/flow/declare-statements/5/expected.json
@@ -12,10 +12,6 @@
       "column": 32
     }
   },
-  "range": [
-    0,
-    32
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 32
       }
     },
-    "range": [
-      0,
-      32
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 32
           }
         },
-        "range": [
-          0,
-          32
-        ],
         "id": {
           "type": "Identifier",
           "start": 17,
@@ -68,10 +56,6 @@
               "column": 31
             }
           },
-          "range": [
-            17,
-            31
-          ],
           "name": "foo",
           "typeAnnotation": {
             "type": "TypeAnnotation",
@@ -87,10 +71,6 @@
                 "column": 31
               }
             },
-            "range": [
-              20,
-              31
-            ],
             "typeAnnotation": {
               "type": "FunctionTypeAnnotation",
               "start": 20,
@@ -105,10 +85,6 @@
                   "column": 31
                 }
               },
-              "range": [
-                20,
-                31
-              ],
               "typeParameters": {
                 "type": "TypeParameterDeclaration",
                 "start": 20,
@@ -123,10 +99,6 @@
                     "column": 23
                   }
                 },
-                "range": [
-                  20,
-                  23
-                ],
                 "params": [
                   {
                     "type": "Identifier",
@@ -142,10 +114,6 @@
                         "column": 22
                       }
                     },
-                    "range": [
-                      21,
-                      22
-                    ],
                     "name": "T"
                   }
                 ]
@@ -165,16 +133,13 @@
                     "line": 1,
                     "column": 31
                   }
-                },
-                "range": [
-                  27,
-                  31
-                ]
+                }
               }
             }
           }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/declare-statements/6/expected.json b/test/fixtures/flow/declare-statements/6/expected.json
index e7de9c8dae..c61da189d6 100644
--- a/test/fixtures/flow/declare-statements/6/expected.json
+++ b/test/fixtures/flow/declare-statements/6/expected.json
@@ -12,10 +12,6 @@
       "column": 49
     }
   },
-  "range": [
-    0,
-    49
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 49
       }
     },
-    "range": [
-      0,
-      49
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 49
           }
         },
-        "range": [
-          0,
-          49
-        ],
         "id": {
           "type": "Identifier",
           "start": 17,
@@ -68,10 +56,6 @@
               "column": 48
             }
           },
-          "range": [
-            17,
-            48
-          ],
           "name": "foo",
           "typeAnnotation": {
             "type": "TypeAnnotation",
@@ -87,10 +71,6 @@
                 "column": 48
               }
             },
-            "range": [
-              20,
-              48
-            ],
             "typeAnnotation": {
               "type": "FunctionTypeAnnotation",
               "start": 20,
@@ -105,10 +85,6 @@
                   "column": 48
                 }
               },
-              "range": [
-                20,
-                48
-              ],
               "typeParameters": null,
               "params": [
                 {
@@ -125,10 +101,6 @@
                       "column": 30
                     }
                   },
-                  "range": [
-                    21,
-                    30
-                  ],
                   "name": {
                     "type": "Identifier",
                     "start": 21,
@@ -143,10 +115,6 @@
                         "column": 22
                       }
                     },
-                    "range": [
-                      21,
-                      22
-                    ],
                     "name": "x"
                   },
                   "optional": false,
@@ -163,11 +131,7 @@
                         "line": 1,
                         "column": 30
                       }
-                    },
-                    "range": [
-                      24,
-                      30
-                    ]
+                    }
                   }
                 },
                 {
@@ -184,10 +148,6 @@
                       "column": 41
                     }
                   },
-                  "range": [
-                    32,
-                    41
-                  ],
                   "name": {
                     "type": "Identifier",
                     "start": 32,
@@ -202,10 +162,6 @@
                         "column": 33
                       }
                     },
-                    "range": [
-                      32,
-                      33
-                    ],
                     "name": "y"
                   },
                   "optional": false,
@@ -222,11 +178,7 @@
                         "line": 1,
                         "column": 41
                       }
-                    },
-                    "range": [
-                      35,
-                      41
-                    ]
+                    }
                   }
                 }
               ],
@@ -244,16 +196,13 @@
                     "line": 1,
                     "column": 48
                   }
-                },
-                "range": [
-                  44,
-                  48
-                ]
+                }
               }
             }
           }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/declare-statements/7/expected.json b/test/fixtures/flow/declare-statements/7/expected.json
index 0d4996578e..04218670c8 100644
--- a/test/fixtures/flow/declare-statements/7/expected.json
+++ b/test/fixtures/flow/declare-statements/7/expected.json
@@ -12,10 +12,6 @@
       "column": 74
     }
   },
-  "range": [
-    0,
-    74
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 74
       }
     },
-    "range": [
-      0,
-      74
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 74
           }
         },
-        "range": [
-          0,
-          74
-        ],
         "id": {
           "type": "Identifier",
           "start": 14,
@@ -68,10 +56,6 @@
               "column": 26
             }
           },
-          "range": [
-            14,
-            26
-          ],
           "name": "IViewFactory"
         },
         "typeParameters": null,
@@ -90,10 +74,6 @@
               "column": 74
             }
           },
-          "range": [
-            27,
-            74
-          ],
           "callProperties": [],
           "properties": [
             {
@@ -110,10 +90,6 @@
                   "column": 72
                 }
               },
-              "range": [
-                29,
-                72
-              ],
               "value": {
                 "type": "FunctionTypeAnnotation",
                 "start": 29,
@@ -128,10 +104,6 @@
                     "column": 71
                   }
                 },
-                "range": [
-                  29,
-                  71
-                ],
                 "params": [
                   {
                     "type": "FunctionTypeParam",
@@ -147,10 +119,6 @@
                         "column": 51
                       }
                     },
-                    "range": [
-                      40,
-                      51
-                    ],
                     "name": {
                       "type": "Identifier",
                       "start": 40,
@@ -165,10 +133,6 @@
                           "column": 44
                         }
                       },
-                      "range": [
-                        40,
-                        44
-                      ],
                       "name": "view"
                     },
                     "optional": false,
@@ -186,10 +150,6 @@
                           "column": 51
                         }
                       },
-                      "range": [
-                        45,
-                        51
-                      ],
                       "typeParameters": null,
                       "id": {
                         "type": "Identifier",
@@ -205,10 +165,6 @@
                             "column": 51
                           }
                         },
-                        "range": [
-                          45,
-                          51
-                        ],
                         "name": "Object"
                       }
                     }
@@ -227,10 +183,6 @@
                         "column": 64
                       }
                     },
-                    "range": [
-                      53,
-                      64
-                    ],
                     "name": {
                       "type": "Identifier",
                       "start": 53,
@@ -245,10 +197,6 @@
                           "column": 57
                         }
                       },
-                      "range": [
-                        53,
-                        57
-                      ],
                       "name": "prop"
                     },
                     "optional": false,
@@ -265,11 +213,7 @@
                           "line": 1,
                           "column": 64
                         }
-                      },
-                      "range": [
-                        58,
-                        64
-                      ]
+                      }
                     }
                   }
                 ],
@@ -288,11 +232,7 @@
                       "line": 1,
                       "column": 71
                     }
-                  },
-                  "range": [
-                    67,
-                    71
-                  ]
+                  }
                 }
               },
               "key": {
@@ -309,10 +249,6 @@
                     "column": 39
                   }
                 },
-                "range": [
-                  29,
-                  39
-                ],
                 "name": "didAnimate"
               },
               "optional": false
@@ -322,5 +258,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/declare-statements/8/expected.json b/test/fixtures/flow/declare-statements/8/expected.json
index 38971e4232..18bc5e8955 100644
--- a/test/fixtures/flow/declare-statements/8/expected.json
+++ b/test/fixtures/flow/declare-statements/8/expected.json
@@ -12,10 +12,6 @@
       "column": 18
     }
   },
-  "range": [
-    0,
-    18
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 18
       }
     },
-    "range": [
-      0,
-      18
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 18
           }
         },
-        "range": [
-          0,
-          18
-        ],
         "id": {
           "type": "Identifier",
           "start": 14,
@@ -68,10 +56,6 @@
               "column": 15
             }
           },
-          "range": [
-            14,
-            15
-          ],
           "name": "A"
         },
         "typeParameters": null,
@@ -90,15 +74,12 @@
               "column": 18
             }
           },
-          "range": [
-            16,
-            18
-          ],
           "callProperties": [],
           "properties": [],
           "indexers": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/declare-statements/9/expected.json b/test/fixtures/flow/declare-statements/9/expected.json
index 866fa54fe4..4f5949282f 100644
--- a/test/fixtures/flow/declare-statements/9/expected.json
+++ b/test/fixtures/flow/declare-statements/9/expected.json
@@ -12,10 +12,6 @@
       "column": 45
     }
   },
-  "range": [
-    0,
-    45
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 45
       }
     },
-    "range": [
-      0,
-      45
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 45
           }
         },
-        "range": [
-          0,
-          45
-        ],
         "id": {
           "type": "Identifier",
           "start": 14,
@@ -68,10 +56,6 @@
               "column": 15
             }
           },
-          "range": [
-            14,
-            15
-          ],
           "name": "A"
         },
         "typeParameters": {
@@ -88,10 +72,6 @@
               "column": 18
             }
           },
-          "range": [
-            15,
-            18
-          ],
           "params": [
             {
               "type": "Identifier",
@@ -107,10 +87,6 @@
                   "column": 17
                 }
               },
-              "range": [
-                16,
-                17
-              ],
               "name": "T"
             }
           ]
@@ -130,10 +106,6 @@
                 "column": 31
               }
             },
-            "range": [
-              27,
-              31
-            ],
             "id": {
               "type": "Identifier",
               "start": 27,
@@ -148,10 +120,6 @@
                   "column": 28
                 }
               },
-              "range": [
-                27,
-                28
-              ],
               "name": "B"
             },
             "typeParameters": {
@@ -168,10 +136,6 @@
                   "column": 31
                 }
               },
-              "range": [
-                28,
-                31
-              ],
               "params": [
                 {
                   "type": "GenericTypeAnnotation",
@@ -187,10 +151,6 @@
                       "column": 30
                     }
                   },
-                  "range": [
-                    29,
-                    30
-                  ],
                   "typeParameters": null,
                   "id": {
                     "type": "Identifier",
@@ -206,10 +166,6 @@
                         "column": 30
                       }
                     },
-                    "range": [
-                      29,
-                      30
-                    ],
                     "name": "T"
                   }
                 }
@@ -231,10 +187,6 @@
               "column": 45
             }
           },
-          "range": [
-            32,
-            45
-          ],
           "callProperties": [],
           "properties": [
             {
@@ -251,10 +203,6 @@
                   "column": 43
                 }
               },
-              "range": [
-                34,
-                43
-              ],
               "key": {
                 "type": "Identifier",
                 "start": 34,
@@ -269,10 +217,6 @@
                     "column": 35
                   }
                 },
-                "range": [
-                  34,
-                  35
-                ],
                 "name": "x"
               },
               "value": {
@@ -288,11 +232,7 @@
                     "line": 1,
                     "column": 43
                   }
-                },
-                "range": [
-                  37,
-                  43
-                ]
+                }
               },
               "optional": false
             }
@@ -301,5 +241,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/interfaces-module-and-script/1/expected.json b/test/fixtures/flow/interfaces-module-and-script/1/expected.json
index 4ceacd93fe..f6196760be 100644
--- a/test/fixtures/flow/interfaces-module-and-script/1/expected.json
+++ b/test/fixtures/flow/interfaces-module-and-script/1/expected.json
@@ -12,10 +12,6 @@
       "column": 14
     }
   },
-  "range": [
-    0,
-    14
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 14
       }
     },
-    "range": [
-      0,
-      14
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 14
           }
         },
-        "range": [
-          0,
-          14
-        ],
         "id": {
           "type": "Identifier",
           "start": 10,
@@ -68,10 +56,6 @@
               "column": 11
             }
           },
-          "range": [
-            10,
-            11
-          ],
           "name": "A"
         },
         "typeParameters": null,
@@ -90,15 +74,12 @@
               "column": 14
             }
           },
-          "range": [
-            12,
-            14
-          ],
           "callProperties": [],
           "properties": [],
           "indexers": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/interfaces-module-and-script/2/expected.json b/test/fixtures/flow/interfaces-module-and-script/2/expected.json
index 1b03db804e..953e5928d5 100644
--- a/test/fixtures/flow/interfaces-module-and-script/2/expected.json
+++ b/test/fixtures/flow/interfaces-module-and-script/2/expected.json
@@ -12,10 +12,6 @@
       "column": 24
     }
   },
-  "range": [
-    0,
-    24
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 24
       }
     },
-    "range": [
-      0,
-      24
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 24
           }
         },
-        "range": [
-          0,
-          24
-        ],
         "id": {
           "type": "Identifier",
           "start": 10,
@@ -68,10 +56,6 @@
               "column": 11
             }
           },
-          "range": [
-            10,
-            11
-          ],
           "name": "A"
         },
         "typeParameters": null,
@@ -90,10 +74,6 @@
                 "column": 21
               }
             },
-            "range": [
-              20,
-              21
-            ],
             "id": {
               "type": "Identifier",
               "start": 20,
@@ -108,10 +88,6 @@
                   "column": 21
                 }
               },
-              "range": [
-                20,
-                21
-              ],
               "name": "B"
             },
             "typeParameters": null
@@ -131,15 +107,12 @@
               "column": 24
             }
           },
-          "range": [
-            22,
-            24
-          ],
           "callProperties": [],
           "properties": [],
           "indexers": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/interfaces-module-and-script/3/expected.json b/test/fixtures/flow/interfaces-module-and-script/3/expected.json
index acd086e377..d000a39d98 100644
--- a/test/fixtures/flow/interfaces-module-and-script/3/expected.json
+++ b/test/fixtures/flow/interfaces-module-and-script/3/expected.json
@@ -12,10 +12,6 @@
       "column": 36
     }
   },
-  "range": [
-    0,
-    36
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 36
       }
     },
-    "range": [
-      0,
-      36
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 36
           }
         },
-        "range": [
-          0,
-          36
-        ],
         "id": {
           "type": "Identifier",
           "start": 10,
@@ -68,10 +56,6 @@
               "column": 11
             }
           },
-          "range": [
-            10,
-            11
-          ],
           "name": "A"
         },
         "typeParameters": {
@@ -88,10 +72,6 @@
               "column": 14
             }
           },
-          "range": [
-            11,
-            14
-          ],
           "params": [
             {
               "type": "Identifier",
@@ -107,10 +87,6 @@
                   "column": 13
                 }
               },
-              "range": [
-                12,
-                13
-              ],
               "name": "T"
             }
           ]
@@ -130,10 +106,6 @@
                 "column": 27
               }
             },
-            "range": [
-              23,
-              27
-            ],
             "id": {
               "type": "Identifier",
               "start": 23,
@@ -148,10 +120,6 @@
                   "column": 24
                 }
               },
-              "range": [
-                23,
-                24
-              ],
               "name": "B"
             },
             "typeParameters": {
@@ -168,10 +136,6 @@
                   "column": 27
                 }
               },
-              "range": [
-                24,
-                27
-              ],
               "params": [
                 {
                   "type": "GenericTypeAnnotation",
@@ -187,10 +151,6 @@
                       "column": 26
                     }
                   },
-                  "range": [
-                    25,
-                    26
-                  ],
                   "typeParameters": null,
                   "id": {
                     "type": "Identifier",
@@ -206,10 +166,6 @@
                         "column": 26
                       }
                     },
-                    "range": [
-                      25,
-                      26
-                    ],
                     "name": "T"
                   }
                 }
@@ -230,10 +186,6 @@
                 "column": 33
               }
             },
-            "range": [
-              29,
-              33
-            ],
             "id": {
               "type": "Identifier",
               "start": 29,
@@ -248,10 +200,6 @@
                   "column": 30
                 }
               },
-              "range": [
-                29,
-                30
-              ],
               "name": "C"
             },
             "typeParameters": {
@@ -268,10 +216,6 @@
                   "column": 33
                 }
               },
-              "range": [
-                30,
-                33
-              ],
               "params": [
                 {
                   "type": "GenericTypeAnnotation",
@@ -287,10 +231,6 @@
                       "column": 32
                     }
                   },
-                  "range": [
-                    31,
-                    32
-                  ],
                   "typeParameters": null,
                   "id": {
                     "type": "Identifier",
@@ -306,10 +246,6 @@
                         "column": 32
                       }
                     },
-                    "range": [
-                      31,
-                      32
-                    ],
                     "name": "T"
                   }
                 }
@@ -331,15 +267,12 @@
               "column": 36
             }
           },
-          "range": [
-            34,
-            36
-          ],
           "callProperties": [],
           "properties": [],
           "indexers": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/interfaces-module-and-script/4/expected.json b/test/fixtures/flow/interfaces-module-and-script/4/expected.json
index 10b189614c..bf9c53c0fa 100644
--- a/test/fixtures/flow/interfaces-module-and-script/4/expected.json
+++ b/test/fixtures/flow/interfaces-module-and-script/4/expected.json
@@ -12,10 +12,6 @@
       "column": 34
     }
   },
-  "range": [
-    0,
-    34
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 34
       }
     },
-    "range": [
-      0,
-      34
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 34
           }
         },
-        "range": [
-          0,
-          34
-        ],
         "id": {
           "type": "Identifier",
           "start": 10,
@@ -68,10 +56,6 @@
               "column": 11
             }
           },
-          "range": [
-            10,
-            11
-          ],
           "name": "A"
         },
         "typeParameters": null,
@@ -90,10 +74,6 @@
               "column": 34
             }
           },
-          "range": [
-            12,
-            34
-          ],
           "callProperties": [],
           "properties": [
             {
@@ -110,10 +90,6 @@
                   "column": 32
                 }
               },
-              "range": [
-                14,
-                32
-              ],
               "key": {
                 "type": "Identifier",
                 "start": 14,
@@ -128,10 +104,6 @@
                     "column": 17
                   }
                 },
-                "range": [
-                  14,
-                  17
-                ],
                 "name": "foo"
               },
               "value": {
@@ -148,10 +120,6 @@
                     "column": 31
                   }
                 },
-                "range": [
-                  19,
-                  31
-                ],
                 "params": [],
                 "rest": null,
                 "returnType": {
@@ -167,11 +135,7 @@
                       "line": 1,
                       "column": 31
                     }
-                  },
-                  "range": [
-                    25,
-                    31
-                  ]
+                  }
                 },
                 "typeParameters": null
               },
@@ -182,5 +146,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/interfaces-module-and-script/5/expected.json b/test/fixtures/flow/interfaces-module-and-script/5/expected.json
index 20f66b57c4..8c08920f33 100644
--- a/test/fixtures/flow/interfaces-module-and-script/5/expected.json
+++ b/test/fixtures/flow/interfaces-module-and-script/5/expected.json
@@ -12,10 +12,6 @@
       "column": 65
     }
   },
-  "range": [
-    0,
-    65
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 65
       }
     },
-    "range": [
-      0,
-      65
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 65
           }
         },
-        "range": [
-          0,
-          65
-        ],
         "id": {
           "type": "Identifier",
           "start": 10,
@@ -68,10 +56,6 @@
               "column": 20
             }
           },
-          "range": [
-            10,
-            20
-          ],
           "name": "Dictionary"
         },
         "typeParameters": null,
@@ -90,10 +74,6 @@
               "column": 65
             }
           },
-          "range": [
-            21,
-            65
-          ],
           "callProperties": [],
           "properties": [
             {
@@ -110,10 +90,6 @@
                   "column": 63
                 }
               },
-              "range": [
-                48,
-                63
-              ],
               "key": {
                 "type": "Identifier",
                 "start": 48,
@@ -128,10 +104,6 @@
                     "column": 54
                   }
                 },
-                "range": [
-                  48,
-                  54
-                ],
                 "name": "length"
               },
               "value": {
@@ -147,11 +119,7 @@
                     "line": 1,
                     "column": 62
                   }
-                },
-                "range": [
-                  56,
-                  62
-                ]
+                }
               },
               "optional": false
             }
@@ -171,10 +139,6 @@
                   "column": 47
                 }
               },
-              "range": [
-                23,
-                47
-              ],
               "id": {
                 "type": "Identifier",
                 "start": 24,
@@ -189,10 +153,6 @@
                     "column": 29
                   }
                 },
-                "range": [
-                  24,
-                  29
-                ],
                 "name": "index"
               },
               "key": {
@@ -208,11 +168,7 @@
                     "line": 1,
                     "column": 37
                   }
-                },
-                "range": [
-                  31,
-                  37
-                ]
+                }
               },
               "value": {
                 "type": "StringTypeAnnotation",
@@ -227,16 +183,13 @@
                     "line": 1,
                     "column": 46
                   }
-                },
-                "range": [
-                  40,
-                  46
-                ]
+                }
               }
             }
           ]
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/interfaces-module-and-script/6/expected.json b/test/fixtures/flow/interfaces-module-and-script/6/expected.json
index 91be171773..e2c90567fb 100644
--- a/test/fixtures/flow/interfaces-module-and-script/6/expected.json
+++ b/test/fixtures/flow/interfaces-module-and-script/6/expected.json
@@ -12,10 +12,6 @@
       "column": 27
     }
   },
-  "range": [
-    0,
-    27
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 27
       }
     },
-    "range": [
-      0,
-      27
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 27
           }
         },
-        "range": [
-          0,
-          27
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 9
             }
           },
-          "range": [
-            6,
-            9
-          ],
           "name": "Foo"
         },
         "superClass": null,
@@ -90,10 +74,6 @@
                 "column": 24
               }
             },
-            "range": [
-              21,
-              24
-            ],
             "id": {
               "type": "Identifier",
               "start": 21,
@@ -108,10 +88,6 @@
                   "column": 24
                 }
               },
-              "range": [
-                21,
-                24
-              ],
               "name": "Bar"
             },
             "typeParameters": null
@@ -131,13 +107,10 @@
               "column": 27
             }
           },
-          "range": [
-            25,
-            27
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/interfaces-module-and-script/7/expected.json b/test/fixtures/flow/interfaces-module-and-script/7/expected.json
index c8d915dd47..edfbf9f89b 100644
--- a/test/fixtures/flow/interfaces-module-and-script/7/expected.json
+++ b/test/fixtures/flow/interfaces-module-and-script/7/expected.json
@@ -12,10 +12,6 @@
       "column": 52
     }
   },
-  "range": [
-    0,
-    52
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 52
       }
     },
-    "range": [
-      0,
-      52
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 52
           }
         },
-        "range": [
-          0,
-          52
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 9
             }
           },
-          "range": [
-            6,
-            9
-          ],
           "name": "Foo"
         },
         "superClass": {
@@ -88,10 +72,6 @@
               "column": 21
             }
           },
-          "range": [
-            18,
-            21
-          ],
           "name": "Bar"
         },
         "implements": [
@@ -109,10 +89,6 @@
                 "column": 36
               }
             },
-            "range": [
-              33,
-              36
-            ],
             "id": {
               "type": "Identifier",
               "start": 33,
@@ -127,10 +103,6 @@
                   "column": 36
                 }
               },
-              "range": [
-                33,
-                36
-              ],
               "name": "Bat"
             },
             "typeParameters": null
@@ -149,10 +121,6 @@
                 "column": 49
               }
             },
-            "range": [
-              38,
-              49
-            ],
             "id": {
               "type": "Identifier",
               "start": 38,
@@ -167,10 +135,6 @@
                   "column": 41
                 }
               },
-              "range": [
-                38,
-                41
-              ],
               "name": "Man"
             },
             "typeParameters": {
@@ -187,10 +151,6 @@
                   "column": 49
                 }
               },
-              "range": [
-                41,
-                49
-              ],
               "params": [
                 {
                   "type": "NumberTypeAnnotation",
@@ -205,11 +165,7 @@
                       "line": 1,
                       "column": 48
                     }
-                  },
-                  "range": [
-                    42,
-                    48
-                  ]
+                  }
                 }
               ]
             }
@@ -229,13 +185,10 @@
               "column": 52
             }
           },
-          "range": [
-            50,
-            52
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/interfaces-module-and-script/8/expected.json b/test/fixtures/flow/interfaces-module-and-script/8/expected.json
index 9a8e2c12fd..64e39ba8ff 100644
--- a/test/fixtures/flow/interfaces-module-and-script/8/expected.json
+++ b/test/fixtures/flow/interfaces-module-and-script/8/expected.json
@@ -12,10 +12,6 @@
       "column": 48
     }
   },
-  "range": [
-    0,
-    48
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 48
       }
     },
-    "range": [
-      0,
-      48
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 48
           }
         },
-        "range": [
-          0,
-          48
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 9
             }
           },
-          "range": [
-            6,
-            9
-          ],
           "name": "Foo"
         },
         "superClass": {
@@ -88,10 +72,6 @@
               "column": 45
             }
           },
-          "range": [
-            18,
-            45
-          ],
           "id": {
             "type": "Identifier",
             "start": 24,
@@ -106,10 +86,6 @@
                 "column": 27
               }
             },
-            "range": [
-              24,
-              27
-            ],
             "name": "Bar"
           },
           "superClass": null,
@@ -128,10 +104,6 @@
                   "column": 42
                 }
               },
-              "range": [
-                39,
-                42
-              ],
               "id": {
                 "type": "Identifier",
                 "start": 39,
@@ -146,10 +118,6 @@
                     "column": 42
                   }
                 },
-                "range": [
-                  39,
-                  42
-                ],
                 "name": "Bat"
               },
               "typeParameters": null
@@ -169,10 +137,6 @@
                 "column": 45
               }
             },
-            "range": [
-              43,
-              45
-            ],
             "body": []
           }
         },
@@ -190,13 +154,10 @@
               "column": 48
             }
           },
-          "range": [
-            46,
-            48
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/interfaces-module-and-script/9/expected.json b/test/fixtures/flow/interfaces-module-and-script/9/expected.json
index 203a063005..d68a71a9c4 100644
--- a/test/fixtures/flow/interfaces-module-and-script/9/expected.json
+++ b/test/fixtures/flow/interfaces-module-and-script/9/expected.json
@@ -12,10 +12,6 @@
       "column": 63
     }
   },
-  "range": [
-    0,
-    63
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 63
       }
     },
-    "range": [
-      0,
-      63
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 63
           }
         },
-        "range": [
-          0,
-          63
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 9
             }
           },
-          "range": [
-            6,
-            9
-          ],
           "name": "Foo"
         },
         "superClass": {
@@ -88,10 +72,6 @@
               "column": 45
             }
           },
-          "range": [
-            18,
-            45
-          ],
           "id": {
             "type": "Identifier",
             "start": 24,
@@ -106,10 +86,6 @@
                 "column": 27
               }
             },
-            "range": [
-              24,
-              27
-            ],
             "name": "Bar"
           },
           "superClass": null,
@@ -128,10 +104,6 @@
                   "column": 42
                 }
               },
-              "range": [
-                39,
-                42
-              ],
               "id": {
                 "type": "Identifier",
                 "start": 39,
@@ -146,10 +118,6 @@
                     "column": 42
                   }
                 },
-                "range": [
-                  39,
-                  42
-                ],
                 "name": "Bat"
               },
               "typeParameters": null
@@ -169,10 +137,6 @@
                 "column": 45
               }
             },
-            "range": [
-              43,
-              45
-            ],
             "body": []
           }
         },
@@ -191,10 +155,6 @@
                 "column": 60
               }
             },
-            "range": [
-              57,
-              60
-            ],
             "id": {
               "type": "Identifier",
               "start": 57,
@@ -209,10 +169,6 @@
                   "column": 60
                 }
               },
-              "range": [
-                57,
-                60
-              ],
               "name": "Man"
             },
             "typeParameters": null
@@ -232,13 +188,10 @@
               "column": 63
             }
           },
-          "range": [
-            61,
-            63
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/number-literal-types/1/expected.json b/test/fixtures/flow/number-literal-types/1/expected.json
index 30aacf2c94..cda39f4468 100644
--- a/test/fixtures/flow/number-literal-types/1/expected.json
+++ b/test/fixtures/flow/number-literal-types/1/expected.json
@@ -12,10 +12,6 @@
       "column": 10
     }
   },
-  "range": [
-    0,
-    10
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 10
       }
     },
-    "range": [
-      0,
-      10
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 10
           }
         },
-        "range": [
-          0,
-          10
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 10
               }
             },
-            "range": [
-              4,
-              10
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 10
                 }
               },
-              "range": [
-                4,
-                10
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 10
                   }
                 },
-                "range": [
-                  5,
-                  10
-                ],
                 "typeAnnotation": {
                   "type": "NumberLiteralTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 10
                     }
                   },
-                  "range": [
-                    7,
-                    10
-                  ],
                   "value": 123,
                   "rawValue": 123,
                   "raw": "123"
@@ -140,5 +112,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/number-literal-types/2/expected.json b/test/fixtures/flow/number-literal-types/2/expected.json
index c26dce9cb8..6724acbc50 100644
--- a/test/fixtures/flow/number-literal-types/2/expected.json
+++ b/test/fixtures/flow/number-literal-types/2/expected.json
@@ -12,10 +12,6 @@
       "column": 12
     }
   },
-  "range": [
-    0,
-    12
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 12
       }
     },
-    "range": [
-      0,
-      12
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 12
           }
         },
-        "range": [
-          0,
-          12
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 12
               }
             },
-            "range": [
-              4,
-              12
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 12
                 }
               },
-              "range": [
-                4,
-                12
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 12
                   }
                 },
-                "range": [
-                  5,
-                  12
-                ],
                 "typeAnnotation": {
                   "type": "NumberLiteralTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 12
                     }
                   },
-                  "range": [
-                    7,
-                    12
-                  ],
                   "value": 123,
                   "rawValue": 123,
                   "raw": "123.0"
@@ -140,5 +112,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/number-literal-types/3/expected.json b/test/fixtures/flow/number-literal-types/3/expected.json
index b23cfb0fe4..43a7969885 100644
--- a/test/fixtures/flow/number-literal-types/3/expected.json
+++ b/test/fixtures/flow/number-literal-types/3/expected.json
@@ -12,10 +12,6 @@
       "column": 11
     }
   },
-  "range": [
-    0,
-    11
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 11
       }
     },
-    "range": [
-      0,
-      11
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 11
           }
         },
-        "range": [
-          0,
-          11
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 11
               }
             },
-            "range": [
-              4,
-              11
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 11
                 }
               },
-              "range": [
-                4,
-                11
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 11
                   }
                 },
-                "range": [
-                  5,
-                  11
-                ],
                 "typeAnnotation": {
                   "type": "NumberLiteralTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 11
                     }
                   },
-                  "range": [
-                    7,
-                    11
-                  ],
                   "value": 123,
                   "rawValue": 123,
                   "raw": "0x7B"
@@ -140,5 +112,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/number-literal-types/4/expected.json b/test/fixtures/flow/number-literal-types/4/expected.json
index 81303eaa96..2f19c09446 100644
--- a/test/fixtures/flow/number-literal-types/4/expected.json
+++ b/test/fixtures/flow/number-literal-types/4/expected.json
@@ -12,10 +12,6 @@
       "column": 16
     }
   },
-  "range": [
-    0,
-    16
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 16
       }
     },
-    "range": [
-      0,
-      16
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 16
           }
         },
-        "range": [
-          0,
-          16
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 16
               }
             },
-            "range": [
-              4,
-              16
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 16
                 }
               },
-              "range": [
-                4,
-                16
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 16
                   }
                 },
-                "range": [
-                  5,
-                  16
-                ],
                 "typeAnnotation": {
                   "type": "NumberLiteralTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 16
                     }
                   },
-                  "range": [
-                    7,
-                    16
-                  ],
                   "value": 123,
                   "rawValue": 123,
                   "raw": "0b1111011"
@@ -140,5 +112,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/number-literal-types/5/expected.json b/test/fixtures/flow/number-literal-types/5/expected.json
index 2e2d609b3f..87d29f96e7 100644
--- a/test/fixtures/flow/number-literal-types/5/expected.json
+++ b/test/fixtures/flow/number-literal-types/5/expected.json
@@ -12,10 +12,6 @@
       "column": 12
     }
   },
-  "range": [
-    0,
-    12
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 12
       }
     },
-    "range": [
-      0,
-      12
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 12
           }
         },
-        "range": [
-          0,
-          12
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 12
               }
             },
-            "range": [
-              4,
-              12
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 12
                 }
               },
-              "range": [
-                4,
-                12
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 12
                   }
                 },
-                "range": [
-                  5,
-                  12
-                ],
                 "typeAnnotation": {
                   "type": "NumberLiteralTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 12
                     }
                   },
-                  "range": [
-                    7,
-                    12
-                  ],
                   "value": 123,
                   "rawValue": 123,
                   "raw": "0o173"
@@ -140,5 +112,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/qualified-generic-type/1/expected.json b/test/fixtures/flow/qualified-generic-type/1/expected.json
index 71e86249f2..74c8b20f8e 100644
--- a/test/fixtures/flow/qualified-generic-type/1/expected.json
+++ b/test/fixtures/flow/qualified-generic-type/1/expected.json
@@ -12,10 +12,6 @@
       "column": 11
     }
   },
-  "range": [
-    0,
-    11
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 11
       }
     },
-    "range": [
-      0,
-      11
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 11
           }
         },
-        "range": [
-          0,
-          11
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 11
               }
             },
-            "range": [
-              4,
-              11
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 11
                 }
               },
-              "range": [
-                4,
-                11
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 11
                   }
                 },
-                "range": [
-                  6,
-                  11
-                ],
                 "typeAnnotation": {
                   "type": "GenericTypeAnnotation",
                   "start": 8,
@@ -124,10 +100,6 @@
                       "column": 11
                     }
                   },
-                  "range": [
-                    8,
-                    11
-                  ],
                   "typeParameters": null,
                   "id": {
                     "type": "QualifiedTypeIdentifier",
@@ -143,10 +115,6 @@
                         "column": 11
                       }
                     },
-                    "range": [
-                      8,
-                      11
-                    ],
                     "qualification": {
                       "type": "Identifier",
                       "start": 8,
@@ -161,10 +129,6 @@
                           "column": 9
                         }
                       },
-                      "range": [
-                        8,
-                        9
-                      ],
                       "name": "A"
                     },
                     "id": {
@@ -181,10 +145,6 @@
                           "column": 11
                         }
                       },
-                      "range": [
-                        10,
-                        11
-                      ],
                       "name": "B"
                     }
                   }
@@ -197,5 +157,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/qualified-generic-type/2/expected.json b/test/fixtures/flow/qualified-generic-type/2/expected.json
index 74e006bb05..56ec96bee3 100644
--- a/test/fixtures/flow/qualified-generic-type/2/expected.json
+++ b/test/fixtures/flow/qualified-generic-type/2/expected.json
@@ -12,10 +12,6 @@
       "column": 13
     }
   },
-  "range": [
-    0,
-    13
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 13
       }
     },
-    "range": [
-      0,
-      13
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 13
           }
         },
-        "range": [
-          0,
-          13
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 13
               }
             },
-            "range": [
-              4,
-              13
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 13
                 }
               },
-              "range": [
-                4,
-                13
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 13
                   }
                 },
-                "range": [
-                  6,
-                  13
-                ],
                 "typeAnnotation": {
                   "type": "GenericTypeAnnotation",
                   "start": 8,
@@ -124,10 +100,6 @@
                       "column": 13
                     }
                   },
-                  "range": [
-                    8,
-                    13
-                  ],
                   "typeParameters": null,
                   "id": {
                     "type": "QualifiedTypeIdentifier",
@@ -143,10 +115,6 @@
                         "column": 13
                       }
                     },
-                    "range": [
-                      8,
-                      13
-                    ],
                     "qualification": {
                       "type": "QualifiedTypeIdentifier",
                       "start": 8,
@@ -161,10 +129,6 @@
                           "column": 11
                         }
                       },
-                      "range": [
-                        8,
-                        11
-                      ],
                       "qualification": {
                         "type": "Identifier",
                         "start": 8,
@@ -179,10 +143,6 @@
                             "column": 9
                           }
                         },
-                        "range": [
-                          8,
-                          9
-                        ],
                         "name": "A"
                       },
                       "id": {
@@ -199,10 +159,6 @@
                             "column": 11
                           }
                         },
-                        "range": [
-                          10,
-                          11
-                        ],
                         "name": "B"
                       }
                     },
@@ -220,10 +176,6 @@
                           "column": 13
                         }
                       },
-                      "range": [
-                        12,
-                        13
-                      ],
                       "name": "C"
                     }
                   }
@@ -236,5 +188,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/qualified-generic-type/3/expected.json b/test/fixtures/flow/qualified-generic-type/3/expected.json
index 7ffe0ec9fa..5cd3ae50df 100644
--- a/test/fixtures/flow/qualified-generic-type/3/expected.json
+++ b/test/fixtures/flow/qualified-generic-type/3/expected.json
@@ -12,10 +12,6 @@
       "column": 14
     }
   },
-  "range": [
-    0,
-    14
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 14
       }
     },
-    "range": [
-      0,
-      14
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 14
           }
         },
-        "range": [
-          0,
-          14
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 14
               }
             },
-            "range": [
-              4,
-              14
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 14
                 }
               },
-              "range": [
-                4,
-                14
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 14
                   }
                 },
-                "range": [
-                  6,
-                  14
-                ],
                 "typeAnnotation": {
                   "type": "GenericTypeAnnotation",
                   "start": 8,
@@ -124,10 +100,6 @@
                       "column": 14
                     }
                   },
-                  "range": [
-                    8,
-                    14
-                  ],
                   "typeParameters": {
                     "type": "TypeParameterInstantiation",
                     "start": 11,
@@ -142,10 +114,6 @@
                         "column": 14
                       }
                     },
-                    "range": [
-                      11,
-                      14
-                    ],
                     "params": [
                       {
                         "type": "GenericTypeAnnotation",
@@ -161,10 +129,6 @@
                             "column": 13
                           }
                         },
-                        "range": [
-                          12,
-                          13
-                        ],
                         "typeParameters": null,
                         "id": {
                           "type": "Identifier",
@@ -180,10 +144,6 @@
                               "column": 13
                             }
                           },
-                          "range": [
-                            12,
-                            13
-                          ],
                           "name": "T"
                         }
                       }
@@ -203,10 +163,6 @@
                         "column": 11
                       }
                     },
-                    "range": [
-                      8,
-                      11
-                    ],
                     "qualification": {
                       "type": "Identifier",
                       "start": 8,
@@ -221,10 +177,6 @@
                           "column": 9
                         }
                       },
-                      "range": [
-                        8,
-                        9
-                      ],
                       "name": "A"
                     },
                     "id": {
@@ -241,10 +193,6 @@
                           "column": 11
                         }
                       },
-                      "range": [
-                        10,
-                        11
-                      ],
                       "name": "B"
                     }
                   }
@@ -257,5 +205,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/qualified-generic-type/4/expected.json b/test/fixtures/flow/qualified-generic-type/4/expected.json
index f1ba7a0b48..4a826a0f2a 100644
--- a/test/fixtures/flow/qualified-generic-type/4/expected.json
+++ b/test/fixtures/flow/qualified-generic-type/4/expected.json
@@ -12,10 +12,6 @@
       "column": 21
     }
   },
-  "range": [
-    0,
-    21
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 21
       }
     },
-    "range": [
-      0,
-      21
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 21
           }
         },
-        "range": [
-          0,
-          21
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 21
               }
             },
-            "range": [
-              4,
-              21
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 21
                 }
               },
-              "range": [
-                4,
-                21
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 21
                   }
                 },
-                "range": [
-                  6,
-                  21
-                ],
                 "typeAnnotation": {
                   "type": "TypeofTypeAnnotation",
                   "start": 8,
@@ -124,10 +100,6 @@
                       "column": 21
                     }
                   },
-                  "range": [
-                    8,
-                    21
-                  ],
                   "argument": {
                     "type": "GenericTypeAnnotation",
                     "start": 15,
@@ -142,10 +114,6 @@
                         "column": 21
                       }
                     },
-                    "range": [
-                      15,
-                      21
-                    ],
                     "typeParameters": {
                       "type": "TypeParameterInstantiation",
                       "start": 18,
@@ -160,10 +128,6 @@
                           "column": 21
                         }
                       },
-                      "range": [
-                        18,
-                        21
-                      ],
                       "params": [
                         {
                           "type": "GenericTypeAnnotation",
@@ -179,10 +143,6 @@
                               "column": 20
                             }
                           },
-                          "range": [
-                            19,
-                            20
-                          ],
                           "typeParameters": null,
                           "id": {
                             "type": "Identifier",
@@ -198,10 +158,6 @@
                                 "column": 20
                               }
                             },
-                            "range": [
-                              19,
-                              20
-                            ],
                             "name": "T"
                           }
                         }
@@ -221,10 +177,6 @@
                           "column": 18
                         }
                       },
-                      "range": [
-                        15,
-                        18
-                      ],
                       "qualification": {
                         "type": "Identifier",
                         "start": 15,
@@ -239,10 +191,6 @@
                             "column": 16
                           }
                         },
-                        "range": [
-                          15,
-                          16
-                        ],
                         "name": "A"
                       },
                       "id": {
@@ -259,10 +207,6 @@
                             "column": 18
                           }
                         },
-                        "range": [
-                          17,
-                          18
-                        ],
                         "name": "B"
                       }
                     }
@@ -276,5 +220,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/string-literal-types/1/expected.json b/test/fixtures/flow/string-literal-types/1/expected.json
index d3920324d6..45f4f80820 100644
--- a/test/fixtures/flow/string-literal-types/1/expected.json
+++ b/test/fixtures/flow/string-literal-types/1/expected.json
@@ -12,10 +12,6 @@
       "column": 57
     }
   },
-  "range": [
-    0,
-    57
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 57
       }
     },
-    "range": [
-      0,
-      57
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 57
           }
         },
-        "range": [
-          0,
-          57
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 22
             }
           },
-          "range": [
-            9,
-            22
-          ],
           "name": "createElement"
         },
         "generator": false,
@@ -92,10 +76,6 @@
                 "column": 37
               }
             },
-            "range": [
-              23,
-              37
-            ],
             "name": "tagName",
             "typeAnnotation": {
               "type": "TypeAnnotation",
@@ -111,10 +91,6 @@
                   "column": 37
                 }
               },
-              "range": [
-                30,
-                37
-              ],
               "typeAnnotation": {
                 "type": "StringLiteralTypeAnnotation",
                 "start": 32,
@@ -129,10 +105,6 @@
                     "column": 37
                   }
                 },
-                "range": [
-                  32,
-                  37
-                ],
                 "value": "div",
                 "rawValue": "div",
                 "raw": "\"div\""
@@ -154,10 +126,6 @@
               "column": 54
             }
           },
-          "range": [
-            38,
-            54
-          ],
           "typeAnnotation": {
             "type": "GenericTypeAnnotation",
             "start": 40,
@@ -172,10 +140,6 @@
                 "column": 54
               }
             },
-            "range": [
-              40,
-              54
-            ],
             "typeParameters": null,
             "id": {
               "type": "Identifier",
@@ -191,10 +155,6 @@
                   "column": 54
                 }
               },
-              "range": [
-                40,
-                54
-              ],
               "name": "HTMLDivElement"
             }
           }
@@ -213,13 +173,10 @@
               "column": 57
             }
           },
-          "range": [
-            55,
-            57
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/string-literal-types/2/expected.json b/test/fixtures/flow/string-literal-types/2/expected.json
index eca99e8224..c231dace04 100644
--- a/test/fixtures/flow/string-literal-types/2/expected.json
+++ b/test/fixtures/flow/string-literal-types/2/expected.json
@@ -12,10 +12,6 @@
       "column": 57
     }
   },
-  "range": [
-    0,
-    57
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 57
       }
     },
-    "range": [
-      0,
-      57
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 57
           }
         },
-        "range": [
-          0,
-          57
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 22
             }
           },
-          "range": [
-            9,
-            22
-          ],
           "name": "createElement"
         },
         "generator": false,
@@ -92,10 +76,6 @@
                 "column": 37
               }
             },
-            "range": [
-              23,
-              37
-            ],
             "name": "tagName",
             "typeAnnotation": {
               "type": "TypeAnnotation",
@@ -111,10 +91,6 @@
                   "column": 37
                 }
               },
-              "range": [
-                30,
-                37
-              ],
               "typeAnnotation": {
                 "type": "StringLiteralTypeAnnotation",
                 "start": 32,
@@ -129,10 +105,6 @@
                     "column": 37
                   }
                 },
-                "range": [
-                  32,
-                  37
-                ],
                 "value": "div",
                 "rawValue": "div",
                 "raw": "'div'"
@@ -154,10 +126,6 @@
               "column": 54
             }
           },
-          "range": [
-            38,
-            54
-          ],
           "typeAnnotation": {
             "type": "GenericTypeAnnotation",
             "start": 40,
@@ -172,10 +140,6 @@
                 "column": 54
               }
             },
-            "range": [
-              40,
-              54
-            ],
             "typeParameters": null,
             "id": {
               "type": "Identifier",
@@ -191,10 +155,6 @@
                   "column": 54
                 }
               },
-              "range": [
-                40,
-                54
-              ],
               "name": "HTMLDivElement"
             }
           }
@@ -213,13 +173,10 @@
               "column": 57
             }
           },
-          "range": [
-            55,
-            57
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/tuples/1/expected.json b/test/fixtures/flow/tuples/1/expected.json
index 2a26d4d539..a5dd1a823b 100644
--- a/test/fixtures/flow/tuples/1/expected.json
+++ b/test/fixtures/flow/tuples/1/expected.json
@@ -12,10 +12,6 @@
       "column": 16
     }
   },
-  "range": [
-    0,
-    16
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 16
       }
     },
-    "range": [
-      0,
-      16
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 16
           }
         },
-        "range": [
-          0,
-          16
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 15
               }
             },
-            "range": [
-              4,
-              15
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 10
                 }
               },
-              "range": [
-                4,
-                10
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 10
                   }
                 },
-                "range": [
-                  6,
-                  10
-                ],
                 "typeAnnotation": {
                   "type": "TupleTypeAnnotation",
                   "start": 8,
@@ -124,10 +100,6 @@
                       "column": 10
                     }
                   },
-                  "range": [
-                    8,
-                    10
-                  ],
                   "types": []
                 }
               }
@@ -146,10 +118,6 @@
                   "column": 15
                 }
               },
-              "range": [
-                13,
-                15
-              ],
               "elements": []
             }
           }
@@ -157,5 +125,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/tuples/2/expected.json b/test/fixtures/flow/tuples/2/expected.json
index 8229cd8420..628e2579d4 100644
--- a/test/fixtures/flow/tuples/2/expected.json
+++ b/test/fixtures/flow/tuples/2/expected.json
@@ -12,10 +12,6 @@
       "column": 25
     }
   },
-  "range": [
-    0,
-    25
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 25
       }
     },
-    "range": [
-      0,
-      25
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 25
           }
         },
-        "range": [
-          0,
-          25
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 24
               }
             },
-            "range": [
-              4,
-              24
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 16
                 }
               },
-              "range": [
-                4,
-                16
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 16
                   }
                 },
-                "range": [
-                  6,
-                  16
-                ],
                 "typeAnnotation": {
                   "type": "TupleTypeAnnotation",
                   "start": 8,
@@ -124,10 +100,6 @@
                       "column": 16
                     }
                   },
-                  "range": [
-                    8,
-                    16
-                  ],
                   "types": [
                     {
                       "type": "GenericTypeAnnotation",
@@ -143,10 +115,6 @@
                           "column": 15
                         }
                       },
-                      "range": [
-                        9,
-                        15
-                      ],
                       "typeParameters": {
                         "type": "TypeParameterInstantiation",
                         "start": 12,
@@ -161,10 +129,6 @@
                             "column": 15
                           }
                         },
-                        "range": [
-                          12,
-                          15
-                        ],
                         "params": [
                           {
                             "type": "GenericTypeAnnotation",
@@ -180,10 +144,6 @@
                                 "column": 14
                               }
                             },
-                            "range": [
-                              13,
-                              14
-                            ],
                             "typeParameters": null,
                             "id": {
                               "type": "Identifier",
@@ -199,10 +159,6 @@
                                   "column": 14
                                 }
                               },
-                              "range": [
-                                13,
-                                14
-                              ],
                               "name": "T"
                             }
                           }
@@ -222,10 +178,6 @@
                             "column": 12
                           }
                         },
-                        "range": [
-                          9,
-                          12
-                        ],
                         "name": "Foo"
                       }
                     }
@@ -247,10 +199,6 @@
                   "column": 24
                 }
               },
-              "range": [
-                19,
-                24
-              ],
               "elements": [
                 {
                   "type": "Identifier",
@@ -266,10 +214,6 @@
                       "column": 23
                     }
                   },
-                  "range": [
-                    20,
-                    23
-                  ],
                   "name": "foo"
                 }
               ]
@@ -279,5 +223,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/tuples/3/expected.json b/test/fixtures/flow/tuples/3/expected.json
index fe09d42d47..986bbd31ac 100644
--- a/test/fixtures/flow/tuples/3/expected.json
+++ b/test/fixtures/flow/tuples/3/expected.json
@@ -12,10 +12,6 @@
       "column": 27
     }
   },
-  "range": [
-    0,
-    27
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 27
       }
     },
-    "range": [
-      0,
-      27
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 27
           }
         },
-        "range": [
-          0,
-          27
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 26
               }
             },
-            "range": [
-              4,
-              26
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 17
                 }
               },
-              "range": [
-                4,
-                17
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 17
                   }
                 },
-                "range": [
-                  6,
-                  17
-                ],
                 "typeAnnotation": {
                   "type": "TupleTypeAnnotation",
                   "start": 8,
@@ -124,10 +100,6 @@
                       "column": 17
                     }
                   },
-                  "range": [
-                    8,
-                    17
-                  ],
                   "types": [
                     {
                       "type": "NumberTypeAnnotation",
@@ -142,11 +114,7 @@
                           "line": 1,
                           "column": 15
                         }
-                      },
-                      "range": [
-                        9,
-                        15
-                      ]
+                      }
                     }
                   ]
                 }
@@ -166,10 +134,6 @@
                   "column": 26
                 }
               },
-              "range": [
-                20,
-                26
-              ],
               "elements": [
                 {
                   "type": "Literal",
@@ -185,10 +149,6 @@
                       "column": 24
                     }
                   },
-                  "range": [
-                    21,
-                    24
-                  ],
                   "value": 123,
                   "rawValue": 123,
                   "raw": "123"
@@ -200,5 +160,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/tuples/4/expected.json b/test/fixtures/flow/tuples/4/expected.json
index 160c175e09..f78dc3b679 100644
--- a/test/fixtures/flow/tuples/4/expected.json
+++ b/test/fixtures/flow/tuples/4/expected.json
@@ -12,10 +12,6 @@
       "column": 41
     }
   },
-  "range": [
-    0,
-    41
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 41
       }
     },
-    "range": [
-      0,
-      41
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 41
           }
         },
-        "range": [
-          0,
-          41
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 40
               }
             },
-            "range": [
-              4,
-              40
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 24
                 }
               },
-              "range": [
-                4,
-                24
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 24
                   }
                 },
-                "range": [
-                  6,
-                  24
-                ],
                 "typeAnnotation": {
                   "type": "TupleTypeAnnotation",
                   "start": 8,
@@ -124,10 +100,6 @@
                       "column": 24
                     }
                   },
-                  "range": [
-                    8,
-                    24
-                  ],
                   "types": [
                     {
                       "type": "NumberTypeAnnotation",
@@ -142,11 +114,7 @@
                           "line": 1,
                           "column": 15
                         }
-                      },
-                      "range": [
-                        9,
-                        15
-                      ]
+                      }
                     },
                     {
                       "type": "StringTypeAnnotation",
@@ -161,11 +129,7 @@
                           "line": 1,
                           "column": 23
                         }
-                      },
-                      "range": [
-                        17,
-                        23
-                      ]
+                      }
                     }
                   ]
                 }
@@ -185,10 +149,6 @@
                   "column": 40
                 }
               },
-              "range": [
-                27,
-                40
-              ],
               "elements": [
                 {
                   "type": "Literal",
@@ -204,10 +164,6 @@
                       "column": 31
                     }
                   },
-                  "range": [
-                    28,
-                    31
-                  ],
                   "value": 123,
                   "rawValue": 123,
                   "raw": "123"
@@ -226,10 +182,6 @@
                       "column": 39
                     }
                   },
-                  "range": [
-                    33,
-                    39
-                  ],
                   "value": "duck",
                   "rawValue": "duck",
                   "raw": "\"duck\""
@@ -241,5 +193,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-alias/1/expected.json b/test/fixtures/flow/type-alias/1/expected.json
index 5df8886575..a889ed041a 100644
--- a/test/fixtures/flow/type-alias/1/expected.json
+++ b/test/fixtures/flow/type-alias/1/expected.json
@@ -12,10 +12,6 @@
       "column": 19
     }
   },
-  "range": [
-    0,
-    19
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 19
       }
     },
-    "range": [
-      0,
-      19
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 19
           }
         },
-        "range": [
-          0,
-          19
-        ],
         "id": {
           "type": "Identifier",
           "start": 5,
@@ -68,10 +56,6 @@
               "column": 9
             }
           },
-          "range": [
-            5,
-            9
-          ],
           "name": "FBID"
         },
         "typeParameters": null,
@@ -88,13 +72,10 @@
               "line": 1,
               "column": 18
             }
-          },
-          "range": [
-            12,
-            18
-          ]
+          }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-alias/2/expected.json b/test/fixtures/flow/type-alias/2/expected.json
index 89deec6726..3acf74d57a 100644
--- a/test/fixtures/flow/type-alias/2/expected.json
+++ b/test/fixtures/flow/type-alias/2/expected.json
@@ -12,10 +12,6 @@
       "column": 20
     }
   },
-  "range": [
-    0,
-    20
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 20
       }
     },
-    "range": [
-      0,
-      20
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 20
           }
         },
-        "range": [
-          0,
-          20
-        ],
         "id": {
           "type": "Identifier",
           "start": 5,
@@ -68,10 +56,6 @@
               "column": 8
             }
           },
-          "range": [
-            5,
-            8
-          ],
           "name": "Foo"
         },
         "typeParameters": {
@@ -88,10 +72,6 @@
               "column": 11
             }
           },
-          "range": [
-            8,
-            11
-          ],
           "params": [
             {
               "type": "Identifier",
@@ -107,10 +87,6 @@
                   "column": 10
                 }
               },
-              "range": [
-                9,
-                10
-              ],
               "name": "T"
             }
           ]
@@ -129,10 +105,6 @@
               "column": 20
             }
           },
-          "range": [
-            14,
-            20
-          ],
           "typeParameters": {
             "type": "TypeParameterInstantiation",
             "start": 17,
@@ -147,10 +119,6 @@
                 "column": 20
               }
             },
-            "range": [
-              17,
-              20
-            ],
             "params": [
               {
                 "type": "GenericTypeAnnotation",
@@ -166,10 +134,6 @@
                     "column": 19
                   }
                 },
-                "range": [
-                  18,
-                  19
-                ],
                 "typeParameters": null,
                 "id": {
                   "type": "Identifier",
@@ -185,10 +149,6 @@
                       "column": 19
                     }
                   },
-                  "range": [
-                    18,
-                    19
-                  ],
                   "name": "T"
                 }
               }
@@ -208,14 +168,11 @@
                 "column": 17
               }
             },
-            "range": [
-              14,
-              17
-            ],
             "name": "Bar"
           }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-alias/3/expected.json b/test/fixtures/flow/type-alias/3/expected.json
index 3e19e2bb17..411a17ad35 100644
--- a/test/fixtures/flow/type-alias/3/expected.json
+++ b/test/fixtures/flow/type-alias/3/expected.json
@@ -12,10 +12,6 @@
       "column": 25
     }
   },
-  "range": [
-    0,
-    25
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 25
       }
     },
-    "range": [
-      0,
-      25
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 25
           }
         },
-        "range": [
-          0,
-          25
-        ],
         "declaration": {
           "type": "TypeAlias",
           "start": 7,
@@ -68,10 +56,6 @@
               "column": 25
             }
           },
-          "range": [
-            7,
-            25
-          ],
           "id": {
             "type": "Identifier",
             "start": 12,
@@ -86,10 +70,6 @@
                 "column": 15
               }
             },
-            "range": [
-              12,
-              15
-            ],
             "name": "Foo"
           },
           "typeParameters": null,
@@ -106,16 +86,13 @@
                 "line": 1,
                 "column": 24
               }
-            },
-            "range": [
-              18,
-              24
-            ]
+            }
           }
         },
         "specifiers": [],
         "source": null
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/1/expected.json b/test/fixtures/flow/type-annotations/1/expected.json
index 1843928ac2..a2eead1323 100644
--- a/test/fixtures/flow/type-annotations/1/expected.json
+++ b/test/fixtures/flow/type-annotations/1/expected.json
@@ -12,10 +12,6 @@
       "column": 44
     }
   },
-  "range": [
-    0,
-    44
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 44
       }
     },
-    "range": [
-      0,
-      44
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 44
           }
         },
-        "range": [
-          0,
-          44
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            9,
-            12
-          ],
           "name": "foo"
         },
         "generator": false,
@@ -92,10 +76,6 @@
                 "column": 24
               }
             },
-            "range": [
-              13,
-              24
-            ],
             "name": "numVal",
             "typeAnnotation": {
               "type": "TypeAnnotation",
@@ -111,10 +91,6 @@
                   "column": 24
                 }
               },
-              "range": [
-                19,
-                24
-              ],
               "typeAnnotation": {
                 "type": "AnyTypeAnnotation",
                 "start": 21,
@@ -128,11 +104,7 @@
                     "line": 1,
                     "column": 24
                   }
-                },
-                "range": [
-                  21,
-                  24
-                ]
+                }
               }
             }
           },
@@ -150,10 +122,6 @@
                 "column": 41
               }
             },
-            "range": [
-              26,
-              41
-            ],
             "name": "otherVal",
             "typeAnnotation": {
               "type": "TypeAnnotation",
@@ -169,10 +137,6 @@
                   "column": 41
                 }
               },
-              "range": [
-                34,
-                41
-              ],
               "typeAnnotation": {
                 "type": "MixedTypeAnnotation",
                 "start": 36,
@@ -186,11 +150,7 @@
                     "line": 1,
                     "column": 41
                   }
-                },
-                "range": [
-                  36,
-                  41
-                ]
+                }
               }
             }
           }
@@ -209,13 +169,10 @@
               "column": 44
             }
           },
-          "range": [
-            42,
-            44
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/10/expected.json b/test/fixtures/flow/type-annotations/10/expected.json
index d28d3c61f6..a9c9b078b2 100644
--- a/test/fixtures/flow/type-annotations/10/expected.json
+++ b/test/fixtures/flow/type-annotations/10/expected.json
@@ -12,10 +12,6 @@
       "column": 56
     }
   },
-  "range": [
-    0,
-    56
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 56
       }
     },
-    "range": [
-      0,
-      56
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 56
           }
         },
-        "range": [
-          0,
-          56
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            9,
-            12
-          ],
           "name": "foo"
         },
         "generator": false,
@@ -92,10 +76,6 @@
                 "column": 53
               }
             },
-            "range": [
-              13,
-              53
-            ],
             "name": "callback",
             "typeAnnotation": {
               "type": "TypeAnnotation",
@@ -111,10 +91,6 @@
                   "column": 53
                 }
               },
-              "range": [
-                21,
-                53
-              ],
               "typeAnnotation": {
                 "type": "FunctionTypeAnnotation",
                 "start": 23,
@@ -129,10 +105,6 @@
                     "column": 53
                   }
                 },
-                "range": [
-                  23,
-                  53
-                ],
                 "params": [
                   {
                     "type": "FunctionTypeParam",
@@ -148,10 +120,6 @@
                         "column": 31
                       }
                     },
-                    "range": [
-                      24,
-                      31
-                    ],
                     "name": {
                       "type": "Identifier",
                       "start": 24,
@@ -166,10 +134,6 @@
                           "column": 26
                         }
                       },
-                      "range": [
-                        24,
-                        26
-                      ],
                       "name": "_1"
                     },
                     "optional": false,
@@ -186,11 +150,7 @@
                           "line": 1,
                           "column": 31
                         }
-                      },
-                      "range": [
-                        27,
-                        31
-                      ]
+                      }
                     }
                   },
                   {
@@ -207,10 +167,6 @@
                         "column": 42
                       }
                     },
-                    "range": [
-                      33,
-                      42
-                    ],
                     "name": {
                       "type": "Identifier",
                       "start": 33,
@@ -225,10 +181,6 @@
                           "column": 35
                         }
                       },
-                      "range": [
-                        33,
-                        35
-                      ],
                       "name": "_2"
                     },
                     "optional": false,
@@ -245,11 +197,7 @@
                           "line": 1,
                           "column": 42
                         }
-                      },
-                      "range": [
-                        36,
-                        42
-                      ]
+                      }
                     }
                   }
                 ],
@@ -267,11 +215,7 @@
                       "line": 1,
                       "column": 53
                     }
-                  },
-                  "range": [
-                    47,
-                    53
-                  ]
+                  }
                 },
                 "typeParameters": null
               }
@@ -292,13 +236,10 @@
               "column": 56
             }
           },
-          "range": [
-            54,
-            56
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/11/expected.json b/test/fixtures/flow/type-annotations/11/expected.json
index 7dcaa4dc58..9e64b8c0cd 100644
--- a/test/fixtures/flow/type-annotations/11/expected.json
+++ b/test/fixtures/flow/type-annotations/11/expected.json
@@ -12,10 +12,6 @@
       "column": 67
     }
   },
-  "range": [
-    0,
-    67
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 67
       }
     },
-    "range": [
-      0,
-      67
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 67
           }
         },
-        "range": [
-          0,
-          67
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            9,
-            12
-          ],
           "name": "foo"
         },
         "generator": false,
@@ -92,10 +76,6 @@
                 "column": 64
               }
             },
-            "range": [
-              13,
-              64
-            ],
             "name": "callback",
             "typeAnnotation": {
               "type": "TypeAnnotation",
@@ -111,10 +91,6 @@
                   "column": 64
                 }
               },
-              "range": [
-                21,
-                64
-              ],
               "typeAnnotation": {
                 "type": "FunctionTypeAnnotation",
                 "start": 23,
@@ -129,10 +105,6 @@
                     "column": 64
                   }
                 },
-                "range": [
-                  23,
-                  64
-                ],
                 "params": [
                   {
                     "type": "FunctionTypeParam",
@@ -148,10 +120,6 @@
                         "column": 31
                       }
                     },
-                    "range": [
-                      24,
-                      31
-                    ],
                     "name": {
                       "type": "Identifier",
                       "start": 24,
@@ -166,10 +134,6 @@
                           "column": 26
                         }
                       },
-                      "range": [
-                        24,
-                        26
-                      ],
                       "name": "_1"
                     },
                     "optional": false,
@@ -186,11 +150,7 @@
                           "line": 1,
                           "column": 31
                         }
-                      },
-                      "range": [
-                        27,
-                        31
-                      ]
+                      }
                     }
                   }
                 ],
@@ -208,10 +168,6 @@
                       "column": 53
                     }
                   },
-                  "range": [
-                    36,
-                    53
-                  ],
                   "name": {
                     "type": "Identifier",
                     "start": 36,
@@ -226,10 +182,6 @@
                         "column": 39
                       }
                     },
-                    "range": [
-                      36,
-                      39
-                    ],
                     "name": "foo"
                   },
                   "optional": false,
@@ -247,10 +199,6 @@
                         "column": 53
                       }
                     },
-                    "range": [
-                      40,
-                      53
-                    ],
                     "typeParameters": {
                       "type": "TypeParameterInstantiation",
                       "start": 45,
@@ -265,10 +213,6 @@
                           "column": 53
                         }
                       },
-                      "range": [
-                        45,
-                        53
-                      ],
                       "params": [
                         {
                           "type": "NumberTypeAnnotation",
@@ -283,11 +227,7 @@
                               "line": 1,
                               "column": 52
                             }
-                          },
-                          "range": [
-                            46,
-                            52
-                          ]
+                          }
                         }
                       ]
                     },
@@ -305,10 +245,6 @@
                           "column": 45
                         }
                       },
-                      "range": [
-                        40,
-                        45
-                      ],
                       "name": "Array"
                     }
                   }
@@ -326,11 +262,7 @@
                       "line": 1,
                       "column": 64
                     }
-                  },
-                  "range": [
-                    58,
-                    64
-                  ]
+                  }
                 },
                 "typeParameters": null
               }
@@ -351,13 +283,10 @@
               "column": 67
             }
           },
-          "range": [
-            65,
-            67
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/12/expected.json b/test/fixtures/flow/type-annotations/12/expected.json
index 72c0af0dfb..5f22620819 100644
--- a/test/fixtures/flow/type-annotations/12/expected.json
+++ b/test/fixtures/flow/type-annotations/12/expected.json
@@ -12,10 +12,6 @@
       "column": 23
     }
   },
-  "range": [
-    0,
-    23
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 23
       }
     },
-    "range": [
-      0,
-      23
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 23
           }
         },
-        "range": [
-          0,
-          23
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            9,
-            12
-          ],
           "name": "foo"
         },
         "generator": false,
@@ -92,10 +76,6 @@
               "column": 21
             }
           },
-          "range": [
-            14,
-            21
-          ],
           "typeAnnotation": {
             "type": "NumberTypeAnnotation",
             "start": 15,
@@ -109,11 +89,7 @@
                 "line": 1,
                 "column": 21
               }
-            },
-            "range": [
-              15,
-              21
-            ]
+            }
           }
         },
         "body": {
@@ -130,13 +106,10 @@
               "column": 23
             }
           },
-          "range": [
-            21,
-            23
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/13/expected.json b/test/fixtures/flow/type-annotations/13/expected.json
index 647eedc6fd..85d1d32dff 100644
--- a/test/fixtures/flow/type-annotations/13/expected.json
+++ b/test/fixtures/flow/type-annotations/13/expected.json
@@ -12,10 +12,6 @@
       "column": 27
     }
   },
-  "range": [
-    0,
-    27
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 27
       }
     },
-    "range": [
-      0,
-      27
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 27
           }
         },
-        "range": [
-          0,
-          27
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            9,
-            12
-          ],
           "name": "foo"
         },
         "generator": false,
@@ -92,10 +76,6 @@
               "column": 25
             }
           },
-          "range": [
-            14,
-            25
-          ],
           "typeAnnotation": {
             "type": "FunctionTypeAnnotation",
             "start": 15,
@@ -110,10 +90,6 @@
                 "column": 25
               }
             },
-            "range": [
-              15,
-              25
-            ],
             "params": [],
             "rest": null,
             "returnType": {
@@ -129,11 +105,7 @@
                   "line": 1,
                   "column": 25
                 }
-              },
-              "range": [
-                21,
-                25
-              ]
+              }
             },
             "typeParameters": null
           }
@@ -152,13 +124,10 @@
               "column": 27
             }
           },
-          "range": [
-            25,
-            27
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/14/expected.json b/test/fixtures/flow/type-annotations/14/expected.json
index 67be62c43f..1cdbf9b15e 100644
--- a/test/fixtures/flow/type-annotations/14/expected.json
+++ b/test/fixtures/flow/type-annotations/14/expected.json
@@ -12,10 +12,6 @@
       "column": 35
     }
   },
-  "range": [
-    0,
-    35
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 35
       }
     },
-    "range": [
-      0,
-      35
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 35
           }
         },
-        "range": [
-          0,
-          35
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            9,
-            12
-          ],
           "name": "foo"
         },
         "generator": false,
@@ -92,10 +76,6 @@
               "column": 33
             }
           },
-          "range": [
-            14,
-            33
-          ],
           "typeAnnotation": {
             "type": "FunctionTypeAnnotation",
             "start": 15,
@@ -110,10 +90,6 @@
                 "column": 33
               }
             },
-            "range": [
-              15,
-              33
-            ],
             "params": [
               {
                 "type": "FunctionTypeParam",
@@ -129,10 +105,6 @@
                     "column": 22
                   }
                 },
-                "range": [
-                  16,
-                  22
-                ],
                 "name": {
                   "type": "Identifier",
                   "start": 16,
@@ -147,10 +119,6 @@
                       "column": 17
                     }
                   },
-                  "range": [
-                    16,
-                    17
-                  ],
                   "name": "_"
                 },
                 "optional": false,
@@ -167,11 +135,7 @@
                       "line": 1,
                       "column": 22
                     }
-                  },
-                  "range": [
-                    18,
-                    22
-                  ]
+                  }
                 }
               }
             ],
@@ -189,11 +153,7 @@
                   "line": 1,
                   "column": 33
                 }
-              },
-              "range": [
-                27,
-                33
-              ]
+              }
             },
             "typeParameters": null
           }
@@ -212,13 +172,10 @@
               "column": 35
             }
           },
-          "range": [
-            33,
-            35
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/15/expected.json b/test/fixtures/flow/type-annotations/15/expected.json
index fd690efc18..08e4a71f0d 100644
--- a/test/fixtures/flow/type-annotations/15/expected.json
+++ b/test/fixtures/flow/type-annotations/15/expected.json
@@ -12,10 +12,6 @@
       "column": 36
     }
   },
-  "range": [
-    0,
-    36
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 36
       }
     },
-    "range": [
-      0,
-      36
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 36
           }
         },
-        "range": [
-          0,
-          36
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            9,
-            12
-          ],
           "name": "foo"
         },
         "generator": false,
@@ -92,10 +76,6 @@
               "column": 34
             }
           },
-          "range": [
-            14,
-            34
-          ],
           "typeAnnotation": {
             "type": "FunctionTypeAnnotation",
             "start": 15,
@@ -110,10 +90,6 @@
                 "column": 34
               }
             },
-            "range": [
-              15,
-              34
-            ],
             "params": [
               {
                 "type": "FunctionTypeParam",
@@ -129,10 +105,6 @@
                     "column": 23
                   }
                 },
-                "range": [
-                  16,
-                  23
-                ],
                 "name": {
                   "type": "Identifier",
                   "start": 16,
@@ -147,10 +119,6 @@
                       "column": 17
                     }
                   },
-                  "range": [
-                    16,
-                    17
-                  ],
                   "name": "_"
                 },
                 "optional": true,
@@ -167,11 +135,7 @@
                       "line": 1,
                       "column": 23
                     }
-                  },
-                  "range": [
-                    19,
-                    23
-                  ]
+                  }
                 }
               }
             ],
@@ -189,11 +153,7 @@
                   "line": 1,
                   "column": 34
                 }
-              },
-              "range": [
-                28,
-                34
-              ]
+              }
             },
             "typeParameters": null
           }
@@ -212,13 +172,10 @@
               "column": 36
             }
           },
-          "range": [
-            34,
-            36
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/16/expected.json b/test/fixtures/flow/type-annotations/16/expected.json
index 742a14626e..c4db0ece72 100644
--- a/test/fixtures/flow/type-annotations/16/expected.json
+++ b/test/fixtures/flow/type-annotations/16/expected.json
@@ -12,10 +12,6 @@
       "column": 21
     }
   },
-  "range": [
-    0,
-    21
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 21
       }
     },
-    "range": [
-      0,
-      21
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 21
           }
         },
-        "range": [
-          0,
-          21
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            9,
-            12
-          ],
           "name": "foo"
         },
         "generator": false,
@@ -92,10 +76,6 @@
               "column": 18
             }
           },
-          "range": [
-            14,
-            18
-          ],
           "typeAnnotation": {
             "type": "ObjectTypeAnnotation",
             "start": 16,
@@ -110,10 +90,6 @@
                 "column": 18
               }
             },
-            "range": [
-              16,
-              18
-            ],
             "callProperties": [],
             "properties": [],
             "indexers": []
@@ -133,13 +109,10 @@
               "column": 21
             }
           },
-          "range": [
-            19,
-            21
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/17/expected.json b/test/fixtures/flow/type-annotations/17/expected.json
index e0ec22b51e..944df2b6b8 100644
--- a/test/fixtures/flow/type-annotations/17/expected.json
+++ b/test/fixtures/flow/type-annotations/17/expected.json
@@ -12,10 +12,6 @@
       "column": 20
     }
   },
-  "range": [
-    0,
-    20
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 20
       }
     },
-    "range": [
-      0,
-      20
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 20
           }
         },
-        "range": [
-          0,
-          20
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            9,
-            12
-          ],
           "name": "foo"
         },
         "generator": false,
@@ -91,10 +75,6 @@
               "column": 15
             }
           },
-          "range": [
-            12,
-            15
-          ],
           "params": [
             {
               "type": "Identifier",
@@ -110,10 +90,6 @@
                   "column": 14
                 }
               },
-              "range": [
-                13,
-                14
-              ],
               "name": "T"
             }
           ]
@@ -133,13 +109,10 @@
               "column": 20
             }
           },
-          "range": [
-            18,
-            20
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/18/expected.json b/test/fixtures/flow/type-annotations/18/expected.json
index 358b368923..3aa1cbb4f3 100644
--- a/test/fixtures/flow/type-annotations/18/expected.json
+++ b/test/fixtures/flow/type-annotations/18/expected.json
@@ -12,10 +12,6 @@
       "column": 22
     }
   },
-  "range": [
-    0,
-    22
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 22
       }
     },
-    "range": [
-      0,
-      22
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 22
           }
         },
-        "range": [
-          0,
-          22
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            9,
-            12
-          ],
           "name": "foo"
         },
         "generator": false,
@@ -91,10 +75,6 @@
               "column": 17
             }
           },
-          "range": [
-            12,
-            17
-          ],
           "params": [
             {
               "type": "Identifier",
@@ -110,10 +90,6 @@
                   "column": 14
                 }
               },
-              "range": [
-                13,
-                14
-              ],
               "name": "T"
             },
             {
@@ -130,10 +106,6 @@
                   "column": 16
                 }
               },
-              "range": [
-                15,
-                16
-              ],
               "name": "S"
             }
           ]
@@ -153,13 +125,10 @@
               "column": 22
             }
           },
-          "range": [
-            20,
-            22
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/19/expected.json b/test/fixtures/flow/type-annotations/19/expected.json
index 515ddeffb6..1e7c605330 100644
--- a/test/fixtures/flow/type-annotations/19/expected.json
+++ b/test/fixtures/flow/type-annotations/19/expected.json
@@ -12,10 +12,6 @@
       "column": 20
     }
   },
-  "range": [
-    0,
-    20
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 20
       }
     },
-    "range": [
-      0,
-      20
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 20
           }
         },
-        "range": [
-          0,
-          20
-        ],
         "expression": {
           "type": "AssignmentExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 20
             }
           },
-          "range": [
-            0,
-            20
-          ],
           "operator": "=",
           "left": {
             "type": "Identifier",
@@ -87,10 +71,6 @@
                 "column": 1
               }
             },
-            "range": [
-              0,
-              1
-            ],
             "name": "a"
           },
           "right": {
@@ -107,10 +87,6 @@
                 "column": 20
               }
             },
-            "range": [
-              2,
-              20
-            ],
             "id": null,
             "generator": false,
             "expression": false,
@@ -129,10 +105,6 @@
                   "column": 15
                 }
               },
-              "range": [
-                10,
-                15
-              ],
               "params": [
                 {
                   "type": "Identifier",
@@ -148,10 +120,6 @@
                       "column": 12
                     }
                   },
-                  "range": [
-                    11,
-                    12
-                  ],
                   "name": "T"
                 },
                 {
@@ -168,10 +136,6 @@
                       "column": 14
                     }
                   },
-                  "range": [
-                    13,
-                    14
-                  ],
                   "name": "S"
                 }
               ]
@@ -191,15 +155,12 @@
                   "column": 20
                 }
               },
-              "range": [
-                18,
-                20
-              ],
               "body": []
             }
           }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/2/expected.json b/test/fixtures/flow/type-annotations/2/expected.json
index b7c05f26a9..a70a9f9ec3 100644
--- a/test/fixtures/flow/type-annotations/2/expected.json
+++ b/test/fixtures/flow/type-annotations/2/expected.json
@@ -12,10 +12,6 @@
       "column": 30
     }
   },
-  "range": [
-    0,
-    30
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 30
       }
     },
-    "range": [
-      0,
-      30
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 30
           }
         },
-        "range": [
-          0,
-          30
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            9,
-            12
-          ],
           "name": "foo"
         },
         "generator": false,
@@ -92,10 +76,6 @@
                 "column": 27
               }
             },
-            "range": [
-              13,
-              27
-            ],
             "name": "numVal",
             "typeAnnotation": {
               "type": "TypeAnnotation",
@@ -111,10 +91,6 @@
                   "column": 27
                 }
               },
-              "range": [
-                19,
-                27
-              ],
               "typeAnnotation": {
                 "type": "NumberTypeAnnotation",
                 "start": 21,
@@ -128,11 +104,7 @@
                     "line": 1,
                     "column": 27
                   }
-                },
-                "range": [
-                  21,
-                  27
-                ]
+                }
               }
             }
           }
@@ -151,13 +123,10 @@
               "column": 30
             }
           },
-          "range": [
-            28,
-            30
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/20/expected.json b/test/fixtures/flow/type-annotations/20/expected.json
index e64aa9f1ec..9e80067a0b 100644
--- a/test/fixtures/flow/type-annotations/20/expected.json
+++ b/test/fixtures/flow/type-annotations/20/expected.json
@@ -12,10 +12,6 @@
       "column": 31
     }
   },
-  "range": [
-    0,
-    31
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 31
       }
     },
-    "range": [
-      0,
-      31
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 31
           }
         },
-        "range": [
-          0,
-          31
-        ],
         "expression": {
           "type": "AssignmentExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 31
             }
           },
-          "range": [
-            0,
-            31
-          ],
           "operator": "=",
           "left": {
             "type": "Identifier",
@@ -87,10 +71,6 @@
                 "column": 1
               }
             },
-            "range": [
-              0,
-              1
-            ],
             "name": "a"
           },
           "right": {
@@ -107,10 +87,6 @@
                 "column": 31
               }
             },
-            "range": [
-              2,
-              31
-            ],
             "properties": [
               {
                 "type": "Property",
@@ -126,10 +102,6 @@
                     "column": 30
                   }
                 },
-                "range": [
-                  3,
-                  30
-                ],
                 "method": false,
                 "shorthand": false,
                 "computed": false,
@@ -147,10 +119,6 @@
                       "column": 14
                     }
                   },
-                  "range": [
-                    7,
-                    14
-                  ],
                   "name": "fooProp"
                 },
                 "kind": "set",
@@ -168,10 +136,6 @@
                       "column": 30
                     }
                   },
-                  "range": [
-                    14,
-                    30
-                  ],
                   "id": null,
                   "generator": false,
                   "expression": false,
@@ -191,10 +155,6 @@
                           "column": 27
                         }
                       },
-                      "range": [
-                        15,
-                        27
-                      ],
                       "name": "value",
                       "typeAnnotation": {
                         "type": "TypeAnnotation",
@@ -210,10 +170,6 @@
                             "column": 27
                           }
                         },
-                        "range": [
-                          20,
-                          27
-                        ],
                         "typeAnnotation": {
                           "type": "NumberTypeAnnotation",
                           "start": 21,
@@ -227,11 +183,7 @@
                               "line": 1,
                               "column": 27
                             }
-                          },
-                          "range": [
-                            21,
-                            27
-                          ]
+                          }
                         }
                       }
                     }
@@ -250,10 +202,6 @@
                         "column": 30
                       }
                     },
-                    "range": [
-                      28,
-                      30
-                    ],
                     "body": []
                   }
                 }
@@ -263,5 +211,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/21/expected.json b/test/fixtures/flow/type-annotations/21/expected.json
index 4903b1c7f5..f9913f979f 100644
--- a/test/fixtures/flow/type-annotations/21/expected.json
+++ b/test/fixtures/flow/type-annotations/21/expected.json
@@ -12,10 +12,6 @@
       "column": 36
     }
   },
-  "range": [
-    0,
-    36
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 36
       }
     },
-    "range": [
-      0,
-      36
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 36
           }
         },
-        "range": [
-          0,
-          36
-        ],
         "expression": {
           "type": "AssignmentExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 36
             }
           },
-          "range": [
-            0,
-            36
-          ],
           "operator": "=",
           "left": {
             "type": "Identifier",
@@ -87,10 +71,6 @@
                 "column": 1
               }
             },
-            "range": [
-              0,
-              1
-            ],
             "name": "a"
           },
           "right": {
@@ -107,10 +87,6 @@
                 "column": 36
               }
             },
-            "range": [
-              2,
-              36
-            ],
             "properties": [
               {
                 "type": "Property",
@@ -126,10 +102,6 @@
                     "column": 35
                   }
                 },
-                "range": [
-                  3,
-                  35
-                ],
                 "method": false,
                 "shorthand": false,
                 "computed": false,
@@ -147,10 +119,6 @@
                       "column": 14
                     }
                   },
-                  "range": [
-                    7,
-                    14
-                  ],
                   "name": "fooProp"
                 },
                 "kind": "set",
@@ -168,10 +136,6 @@
                       "column": 35
                     }
                   },
-                  "range": [
-                    14,
-                    35
-                  ],
                   "id": null,
                   "generator": false,
                   "expression": false,
@@ -191,10 +155,6 @@
                           "column": 27
                         }
                       },
-                      "range": [
-                        15,
-                        27
-                      ],
                       "name": "value",
                       "typeAnnotation": {
                         "type": "TypeAnnotation",
@@ -210,10 +170,6 @@
                             "column": 27
                           }
                         },
-                        "range": [
-                          20,
-                          27
-                        ],
                         "typeAnnotation": {
                           "type": "NumberTypeAnnotation",
                           "start": 21,
@@ -227,11 +183,7 @@
                               "line": 1,
                               "column": 27
                             }
-                          },
-                          "range": [
-                            21,
-                            27
-                          ]
+                          }
                         }
                       }
                     }
@@ -250,10 +202,6 @@
                         "column": 33
                       }
                     },
-                    "range": [
-                      28,
-                      33
-                    ],
                     "typeAnnotation": {
                       "type": "VoidTypeAnnotation",
                       "start": 29,
@@ -267,11 +215,7 @@
                           "line": 1,
                           "column": 33
                         }
-                      },
-                      "range": [
-                        29,
-                        33
-                      ]
+                      }
                     }
                   },
                   "body": {
@@ -288,10 +232,6 @@
                         "column": 35
                       }
                     },
-                    "range": [
-                      33,
-                      35
-                    ],
                     "body": []
                   }
                 }
@@ -301,5 +241,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/22/expected.json b/test/fixtures/flow/type-annotations/22/expected.json
index 4e9e12dbb8..6f3faa4034 100644
--- a/test/fixtures/flow/type-annotations/22/expected.json
+++ b/test/fixtures/flow/type-annotations/22/expected.json
@@ -12,10 +12,6 @@
       "column": 26
     }
   },
-  "range": [
-    0,
-    26
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 26
       }
     },
-    "range": [
-      0,
-      26
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 26
           }
         },
-        "range": [
-          0,
-          26
-        ],
         "expression": {
           "type": "AssignmentExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 26
             }
           },
-          "range": [
-            0,
-            26
-          ],
           "operator": "=",
           "left": {
             "type": "Identifier",
@@ -87,10 +71,6 @@
                 "column": 1
               }
             },
-            "range": [
-              0,
-              1
-            ],
             "name": "a"
           },
           "right": {
@@ -107,10 +87,6 @@
                 "column": 26
               }
             },
-            "range": [
-              2,
-              26
-            ],
             "properties": [
               {
                 "type": "Property",
@@ -126,10 +102,6 @@
                     "column": 25
                   }
                 },
-                "range": [
-                  3,
-                  25
-                ],
                 "method": false,
                 "shorthand": false,
                 "computed": false,
@@ -147,10 +119,6 @@
                       "column": 14
                     }
                   },
-                  "range": [
-                    7,
-                    14
-                  ],
                   "name": "fooProp"
                 },
                 "kind": "get",
@@ -168,10 +136,6 @@
                       "column": 25
                     }
                   },
-                  "range": [
-                    14,
-                    25
-                  ],
                   "id": null,
                   "generator": false,
                   "expression": false,
@@ -191,10 +155,6 @@
                         "column": 23
                       }
                     },
-                    "range": [
-                      16,
-                      23
-                    ],
                     "typeAnnotation": {
                       "type": "NumberTypeAnnotation",
                       "start": 17,
@@ -208,11 +168,7 @@
                           "line": 1,
                           "column": 23
                         }
-                      },
-                      "range": [
-                        17,
-                        23
-                      ]
+                      }
                     }
                   },
                   "body": {
@@ -229,10 +185,6 @@
                         "column": 25
                       }
                     },
-                    "range": [
-                      23,
-                      25
-                    ],
                     "body": []
                   }
                 }
@@ -242,5 +194,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/23/expected.json b/test/fixtures/flow/type-annotations/23/expected.json
index 26483d8cd8..d2ecdea08f 100644
--- a/test/fixtures/flow/type-annotations/23/expected.json
+++ b/test/fixtures/flow/type-annotations/23/expected.json
@@ -12,10 +12,6 @@
       "column": 21
     }
   },
-  "range": [
-    0,
-    21
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 21
       }
     },
-    "range": [
-      0,
-      21
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 21
           }
         },
-        "range": [
-          0,
-          21
-        ],
         "expression": {
           "type": "AssignmentExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 21
             }
           },
-          "range": [
-            0,
-            21
-          ],
           "operator": "=",
           "left": {
             "type": "Identifier",
@@ -87,10 +71,6 @@
                 "column": 1
               }
             },
-            "range": [
-              0,
-              1
-            ],
             "name": "a"
           },
           "right": {
@@ -107,10 +87,6 @@
                 "column": 21
               }
             },
-            "range": [
-              2,
-              21
-            ],
             "properties": [
               {
                 "type": "Property",
@@ -126,10 +102,6 @@
                     "column": 20
                   }
                 },
-                "range": [
-                  3,
-                  20
-                ],
                 "method": true,
                 "shorthand": false,
                 "computed": false,
@@ -147,10 +119,6 @@
                       "column": 5
                     }
                   },
-                  "range": [
-                    3,
-                    5
-                  ],
                   "name": "id"
                 },
                 "kind": "init",
@@ -168,10 +136,6 @@
                       "column": 20
                     }
                   },
-                  "range": [
-                    8,
-                    20
-                  ],
                   "id": null,
                   "generator": false,
                   "expression": false,
@@ -191,10 +155,6 @@
                           "column": 13
                         }
                       },
-                      "range": [
-                        9,
-                        13
-                      ],
                       "name": "x",
                       "typeAnnotation": {
                         "type": "TypeAnnotation",
@@ -210,10 +170,6 @@
                             "column": 13
                           }
                         },
-                        "range": [
-                          10,
-                          13
-                        ],
                         "typeAnnotation": {
                           "type": "GenericTypeAnnotation",
                           "start": 12,
@@ -228,10 +184,6 @@
                               "column": 13
                             }
                           },
-                          "range": [
-                            12,
-                            13
-                          ],
                           "typeParameters": null,
                           "id": {
                             "type": "Identifier",
@@ -247,10 +199,6 @@
                                 "column": 13
                               }
                             },
-                            "range": [
-                              12,
-                              13
-                            ],
                             "name": "T"
                           }
                         }
@@ -271,10 +219,6 @@
                         "column": 17
                       }
                     },
-                    "range": [
-                      14,
-                      17
-                    ],
                     "typeAnnotation": {
                       "type": "GenericTypeAnnotation",
                       "start": 16,
@@ -289,10 +233,6 @@
                           "column": 17
                         }
                       },
-                      "range": [
-                        16,
-                        17
-                      ],
                       "typeParameters": null,
                       "id": {
                         "type": "Identifier",
@@ -308,10 +248,6 @@
                             "column": 17
                           }
                         },
-                        "range": [
-                          16,
-                          17
-                        ],
                         "name": "T"
                       }
                     }
@@ -330,10 +266,6 @@
                         "column": 20
                       }
                     },
-                    "range": [
-                      18,
-                      20
-                    ],
                     "body": []
                   },
                   "typeParameters": {
@@ -350,10 +282,6 @@
                         "column": 8
                       }
                     },
-                    "range": [
-                      5,
-                      8
-                    ],
                     "params": [
                       {
                         "type": "Identifier",
@@ -369,10 +297,6 @@
                             "column": 7
                           }
                         },
-                        "range": [
-                          6,
-                          7
-                        ],
                         "name": "T"
                       }
                     ]
@@ -384,5 +308,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/24/expected.json b/test/fixtures/flow/type-annotations/24/expected.json
index 943e92a222..499369a52f 100644
--- a/test/fixtures/flow/type-annotations/24/expected.json
+++ b/test/fixtures/flow/type-annotations/24/expected.json
@@ -12,10 +12,6 @@
       "column": 22
     }
   },
-  "range": [
-    0,
-    22
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 22
       }
     },
-    "range": [
-      0,
-      22
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 22
           }
         },
-        "range": [
-          0,
-          22
-        ],
         "expression": {
           "type": "AssignmentExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 22
             }
           },
-          "range": [
-            0,
-            22
-          ],
           "operator": "=",
           "left": {
             "type": "Identifier",
@@ -87,10 +71,6 @@
                 "column": 1
               }
             },
-            "range": [
-              0,
-              1
-            ],
             "name": "a"
           },
           "right": {
@@ -107,10 +87,6 @@
                 "column": 22
               }
             },
-            "range": [
-              2,
-              22
-            ],
             "properties": [
               {
                 "type": "Property",
@@ -126,10 +102,6 @@
                     "column": 21
                   }
                 },
-                "range": [
-                  3,
-                  21
-                ],
                 "method": true,
                 "shorthand": false,
                 "computed": false,
@@ -147,10 +119,6 @@
                       "column": 6
                     }
                   },
-                  "range": [
-                    4,
-                    6
-                  ],
                   "name": "id"
                 },
                 "kind": "init",
@@ -168,10 +136,6 @@
                       "column": 21
                     }
                   },
-                  "range": [
-                    9,
-                    21
-                  ],
                   "id": null,
                   "generator": true,
                   "expression": false,
@@ -191,10 +155,6 @@
                           "column": 14
                         }
                       },
-                      "range": [
-                        10,
-                        14
-                      ],
                       "name": "x",
                       "typeAnnotation": {
                         "type": "TypeAnnotation",
@@ -210,10 +170,6 @@
                             "column": 14
                           }
                         },
-                        "range": [
-                          11,
-                          14
-                        ],
                         "typeAnnotation": {
                           "type": "GenericTypeAnnotation",
                           "start": 13,
@@ -228,10 +184,6 @@
                               "column": 14
                             }
                           },
-                          "range": [
-                            13,
-                            14
-                          ],
                           "typeParameters": null,
                           "id": {
                             "type": "Identifier",
@@ -247,10 +199,6 @@
                                 "column": 14
                               }
                             },
-                            "range": [
-                              13,
-                              14
-                            ],
                             "name": "T"
                           }
                         }
@@ -271,10 +219,6 @@
                         "column": 18
                       }
                     },
-                    "range": [
-                      15,
-                      18
-                    ],
                     "typeAnnotation": {
                       "type": "GenericTypeAnnotation",
                       "start": 17,
@@ -289,10 +233,6 @@
                           "column": 18
                         }
                       },
-                      "range": [
-                        17,
-                        18
-                      ],
                       "typeParameters": null,
                       "id": {
                         "type": "Identifier",
@@ -308,10 +248,6 @@
                             "column": 18
                           }
                         },
-                        "range": [
-                          17,
-                          18
-                        ],
                         "name": "T"
                       }
                     }
@@ -330,10 +266,6 @@
                         "column": 21
                       }
                     },
-                    "range": [
-                      19,
-                      21
-                    ],
                     "body": []
                   },
                   "typeParameters": {
@@ -350,10 +282,6 @@
                         "column": 9
                       }
                     },
-                    "range": [
-                      6,
-                      9
-                    ],
                     "params": [
                       {
                         "type": "Identifier",
@@ -369,10 +297,6 @@
                             "column": 8
                           }
                         },
-                        "range": [
-                          7,
-                          8
-                        ],
                         "name": "T"
                       }
                     ]
@@ -384,5 +308,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/25/expected.json b/test/fixtures/flow/type-annotations/25/expected.json
index d72c7bbcb4..7a1c41ce8a 100644
--- a/test/fixtures/flow/type-annotations/25/expected.json
+++ b/test/fixtures/flow/type-annotations/25/expected.json
@@ -12,10 +12,6 @@
       "column": 27
     }
   },
-  "range": [
-    0,
-    27
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 27
       }
     },
-    "range": [
-      0,
-      27
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 27
           }
         },
-        "range": [
-          0,
-          27
-        ],
         "expression": {
           "type": "AssignmentExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 27
             }
           },
-          "range": [
-            0,
-            27
-          ],
           "operator": "=",
           "left": {
             "type": "Identifier",
@@ -87,10 +71,6 @@
                 "column": 1
               }
             },
-            "range": [
-              0,
-              1
-            ],
             "name": "a"
           },
           "right": {
@@ -107,10 +87,6 @@
                 "column": 27
               }
             },
-            "range": [
-              2,
-              27
-            ],
             "properties": [
               {
                 "type": "Property",
@@ -126,10 +102,6 @@
                     "column": 26
                   }
                 },
-                "range": [
-                  3,
-                  26
-                ],
                 "method": true,
                 "shorthand": false,
                 "computed": false,
@@ -147,10 +119,6 @@
                       "column": 11
                     }
                   },
-                  "range": [
-                    9,
-                    11
-                  ],
                   "name": "id"
                 },
                 "kind": "init",
@@ -168,10 +136,6 @@
                       "column": 26
                     }
                   },
-                  "range": [
-                    14,
-                    26
-                  ],
                   "id": null,
                   "generator": false,
                   "expression": false,
@@ -191,10 +155,6 @@
                           "column": 19
                         }
                       },
-                      "range": [
-                        15,
-                        19
-                      ],
                       "name": "x",
                       "typeAnnotation": {
                         "type": "TypeAnnotation",
@@ -210,10 +170,6 @@
                             "column": 19
                           }
                         },
-                        "range": [
-                          16,
-                          19
-                        ],
                         "typeAnnotation": {
                           "type": "GenericTypeAnnotation",
                           "start": 18,
@@ -228,10 +184,6 @@
                               "column": 19
                             }
                           },
-                          "range": [
-                            18,
-                            19
-                          ],
                           "typeParameters": null,
                           "id": {
                             "type": "Identifier",
@@ -247,10 +199,6 @@
                                 "column": 19
                               }
                             },
-                            "range": [
-                              18,
-                              19
-                            ],
                             "name": "T"
                           }
                         }
@@ -271,10 +219,6 @@
                         "column": 23
                       }
                     },
-                    "range": [
-                      20,
-                      23
-                    ],
                     "typeAnnotation": {
                       "type": "GenericTypeAnnotation",
                       "start": 22,
@@ -289,10 +233,6 @@
                           "column": 23
                         }
                       },
-                      "range": [
-                        22,
-                        23
-                      ],
                       "typeParameters": null,
                       "id": {
                         "type": "Identifier",
@@ -308,10 +248,6 @@
                             "column": 23
                           }
                         },
-                        "range": [
-                          22,
-                          23
-                        ],
                         "name": "T"
                       }
                     }
@@ -330,10 +266,6 @@
                         "column": 26
                       }
                     },
-                    "range": [
-                      24,
-                      26
-                    ],
                     "body": []
                   },
                   "typeParameters": {
@@ -350,10 +282,6 @@
                         "column": 14
                       }
                     },
-                    "range": [
-                      11,
-                      14
-                    ],
                     "params": [
                       {
                         "type": "Identifier",
@@ -369,10 +297,6 @@
                             "column": 13
                           }
                         },
-                        "range": [
-                          12,
-                          13
-                        ],
                         "name": "T"
                       }
                     ]
@@ -384,5 +308,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/26/expected.json b/test/fixtures/flow/type-annotations/26/expected.json
index a9f151fd19..6e91455db9 100644
--- a/test/fixtures/flow/type-annotations/26/expected.json
+++ b/test/fixtures/flow/type-annotations/26/expected.json
@@ -12,10 +12,6 @@
       "column": 22
     }
   },
-  "range": [
-    0,
-    22
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 22
       }
     },
-    "range": [
-      0,
-      22
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 22
           }
         },
-        "range": [
-          0,
-          22
-        ],
         "expression": {
           "type": "AssignmentExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 22
             }
           },
-          "range": [
-            0,
-            22
-          ],
           "operator": "=",
           "left": {
             "type": "Identifier",
@@ -87,10 +71,6 @@
                 "column": 1
               }
             },
-            "range": [
-              0,
-              1
-            ],
             "name": "a"
           },
           "right": {
@@ -107,10 +87,6 @@
                 "column": 22
               }
             },
-            "range": [
-              2,
-              22
-            ],
             "properties": [
               {
                 "type": "Property",
@@ -126,10 +102,6 @@
                     "column": 21
                   }
                 },
-                "range": [
-                  3,
-                  21
-                ],
                 "method": true,
                 "shorthand": false,
                 "computed": false,
@@ -147,10 +119,6 @@
                       "column": 6
                     }
                   },
-                  "range": [
-                    3,
-                    6
-                  ],
                   "value": 123,
                   "rawValue": 123,
                   "raw": "123"
@@ -170,10 +138,6 @@
                       "column": 21
                     }
                   },
-                  "range": [
-                    9,
-                    21
-                  ],
                   "id": null,
                   "generator": false,
                   "expression": false,
@@ -193,10 +157,6 @@
                           "column": 14
                         }
                       },
-                      "range": [
-                        10,
-                        14
-                      ],
                       "name": "x",
                       "typeAnnotation": {
                         "type": "TypeAnnotation",
@@ -212,10 +172,6 @@
                             "column": 14
                           }
                         },
-                        "range": [
-                          11,
-                          14
-                        ],
                         "typeAnnotation": {
                           "type": "GenericTypeAnnotation",
                           "start": 13,
@@ -230,10 +186,6 @@
                               "column": 14
                             }
                           },
-                          "range": [
-                            13,
-                            14
-                          ],
                           "typeParameters": null,
                           "id": {
                             "type": "Identifier",
@@ -249,10 +201,6 @@
                                 "column": 14
                               }
                             },
-                            "range": [
-                              13,
-                              14
-                            ],
                             "name": "T"
                           }
                         }
@@ -273,10 +221,6 @@
                         "column": 18
                       }
                     },
-                    "range": [
-                      15,
-                      18
-                    ],
                     "typeAnnotation": {
                       "type": "GenericTypeAnnotation",
                       "start": 17,
@@ -291,10 +235,6 @@
                           "column": 18
                         }
                       },
-                      "range": [
-                        17,
-                        18
-                      ],
                       "typeParameters": null,
                       "id": {
                         "type": "Identifier",
@@ -310,10 +250,6 @@
                             "column": 18
                           }
                         },
-                        "range": [
-                          17,
-                          18
-                        ],
                         "name": "T"
                       }
                     }
@@ -332,10 +268,6 @@
                         "column": 21
                       }
                     },
-                    "range": [
-                      19,
-                      21
-                    ],
                     "body": []
                   },
                   "typeParameters": {
@@ -352,10 +284,6 @@
                         "column": 9
                       }
                     },
-                    "range": [
-                      6,
-                      9
-                    ],
                     "params": [
                       {
                         "type": "Identifier",
@@ -371,10 +299,6 @@
                             "column": 8
                           }
                         },
-                        "range": [
-                          7,
-                          8
-                        ],
                         "name": "T"
                       }
                     ]
@@ -386,5 +310,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/27/expected.json b/test/fixtures/flow/type-annotations/27/expected.json
index c3a4b43897..626bfacfe8 100644
--- a/test/fixtures/flow/type-annotations/27/expected.json
+++ b/test/fixtures/flow/type-annotations/27/expected.json
@@ -12,10 +12,6 @@
       "column": 39
     }
   },
-  "range": [
-    0,
-    39
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 39
       }
     },
-    "range": [
-      0,
-      39
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 39
           }
         },
-        "range": [
-          0,
-          39
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 9
             }
           },
-          "range": [
-            6,
-            9
-          ],
           "name": "Foo"
         },
         "superClass": null,
@@ -89,10 +73,6 @@
               "column": 39
             }
           },
-          "range": [
-            10,
-            39
-          ],
           "body": [
             {
               "type": "MethodDefinition",
@@ -108,10 +88,6 @@
                   "column": 38
                 }
               },
-              "range": [
-                11,
-                38
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -127,10 +103,6 @@
                     "column": 22
                   }
                 },
-                "range": [
-                  15,
-                  22
-                ],
                 "name": "fooProp"
               },
               "static": false,
@@ -149,10 +121,6 @@
                     "column": 38
                   }
                 },
-                "range": [
-                  22,
-                  38
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -172,10 +140,6 @@
                         "column": 35
                       }
                     },
-                    "range": [
-                      23,
-                      35
-                    ],
                     "name": "value",
                     "typeAnnotation": {
                       "type": "TypeAnnotation",
@@ -191,10 +155,6 @@
                           "column": 35
                         }
                       },
-                      "range": [
-                        28,
-                        35
-                      ],
                       "typeAnnotation": {
                         "type": "NumberTypeAnnotation",
                         "start": 29,
@@ -208,11 +168,7 @@
                             "line": 1,
                             "column": 35
                           }
-                        },
-                        "range": [
-                          29,
-                          35
-                        ]
+                        }
                       }
                     }
                   }
@@ -231,10 +187,6 @@
                       "column": 38
                     }
                   },
-                  "range": [
-                    36,
-                    38
-                  ],
                   "body": []
                 }
               }
@@ -243,5 +195,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/28/expected.json b/test/fixtures/flow/type-annotations/28/expected.json
index 022d46b7f3..fc7065e4ba 100644
--- a/test/fixtures/flow/type-annotations/28/expected.json
+++ b/test/fixtures/flow/type-annotations/28/expected.json
@@ -12,10 +12,6 @@
       "column": 44
     }
   },
-  "range": [
-    0,
-    44
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 44
       }
     },
-    "range": [
-      0,
-      44
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 44
           }
         },
-        "range": [
-          0,
-          44
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 9
             }
           },
-          "range": [
-            6,
-            9
-          ],
           "name": "Foo"
         },
         "superClass": null,
@@ -89,10 +73,6 @@
               "column": 44
             }
           },
-          "range": [
-            10,
-            44
-          ],
           "body": [
             {
               "type": "MethodDefinition",
@@ -108,10 +88,6 @@
                   "column": 43
                 }
               },
-              "range": [
-                11,
-                43
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -127,10 +103,6 @@
                     "column": 22
                   }
                 },
-                "range": [
-                  15,
-                  22
-                ],
                 "name": "fooProp"
               },
               "static": false,
@@ -149,10 +121,6 @@
                     "column": 43
                   }
                 },
-                "range": [
-                  22,
-                  43
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -172,10 +140,6 @@
                         "column": 35
                       }
                     },
-                    "range": [
-                      23,
-                      35
-                    ],
                     "name": "value",
                     "typeAnnotation": {
                       "type": "TypeAnnotation",
@@ -191,10 +155,6 @@
                           "column": 35
                         }
                       },
-                      "range": [
-                        28,
-                        35
-                      ],
                       "typeAnnotation": {
                         "type": "NumberTypeAnnotation",
                         "start": 29,
@@ -208,11 +168,7 @@
                             "line": 1,
                             "column": 35
                           }
-                        },
-                        "range": [
-                          29,
-                          35
-                        ]
+                        }
                       }
                     }
                   }
@@ -231,10 +187,6 @@
                       "column": 41
                     }
                   },
-                  "range": [
-                    36,
-                    41
-                  ],
                   "typeAnnotation": {
                     "type": "VoidTypeAnnotation",
                     "start": 37,
@@ -248,11 +200,7 @@
                         "line": 1,
                         "column": 41
                       }
-                    },
-                    "range": [
-                      37,
-                      41
-                    ]
+                    }
                   }
                 },
                 "body": {
@@ -269,10 +217,6 @@
                       "column": 43
                     }
                   },
-                  "range": [
-                    41,
-                    43
-                  ],
                   "body": []
                 }
               }
@@ -281,5 +225,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/29/expected.json b/test/fixtures/flow/type-annotations/29/expected.json
index f26fac79ac..c778376a2e 100644
--- a/test/fixtures/flow/type-annotations/29/expected.json
+++ b/test/fixtures/flow/type-annotations/29/expected.json
@@ -12,10 +12,6 @@
       "column": 34
     }
   },
-  "range": [
-    0,
-    34
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 34
       }
     },
-    "range": [
-      0,
-      34
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 34
           }
         },
-        "range": [
-          0,
-          34
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 9
             }
           },
-          "range": [
-            6,
-            9
-          ],
           "name": "Foo"
         },
         "superClass": null,
@@ -89,10 +73,6 @@
               "column": 34
             }
           },
-          "range": [
-            10,
-            34
-          ],
           "body": [
             {
               "type": "MethodDefinition",
@@ -108,10 +88,6 @@
                   "column": 33
                 }
               },
-              "range": [
-                11,
-                33
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -127,10 +103,6 @@
                     "column": 22
                   }
                 },
-                "range": [
-                  15,
-                  22
-                ],
                 "name": "fooProp"
               },
               "static": false,
@@ -149,10 +121,6 @@
                     "column": 33
                   }
                 },
-                "range": [
-                  22,
-                  33
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -172,10 +140,6 @@
                       "column": 31
                     }
                   },
-                  "range": [
-                    24,
-                    31
-                  ],
                   "typeAnnotation": {
                     "type": "NumberTypeAnnotation",
                     "start": 25,
@@ -189,11 +153,7 @@
                         "line": 1,
                         "column": 31
                       }
-                    },
-                    "range": [
-                      25,
-                      31
-                    ]
+                    }
                   }
                 },
                 "body": {
@@ -210,10 +170,6 @@
                       "column": 33
                     }
                   },
-                  "range": [
-                    31,
-                    33
-                  ],
                   "body": []
                 }
               }
@@ -222,5 +178,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/3/expected.json b/test/fixtures/flow/type-annotations/3/expected.json
index 0bdd543bab..0bd51ba5a6 100644
--- a/test/fixtures/flow/type-annotations/3/expected.json
+++ b/test/fixtures/flow/type-annotations/3/expected.json
@@ -12,10 +12,6 @@
       "column": 46
     }
   },
-  "range": [
-    0,
-    46
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 46
       }
     },
-    "range": [
-      0,
-      46
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 46
           }
         },
-        "range": [
-          0,
-          46
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            9,
-            12
-          ],
           "name": "foo"
         },
         "generator": false,
@@ -92,10 +76,6 @@
                 "column": 27
               }
             },
-            "range": [
-              13,
-              27
-            ],
             "name": "numVal",
             "typeAnnotation": {
               "type": "TypeAnnotation",
@@ -111,10 +91,6 @@
                   "column": 27
                 }
               },
-              "range": [
-                19,
-                27
-              ],
               "typeAnnotation": {
                 "type": "NumberTypeAnnotation",
                 "start": 21,
@@ -128,11 +104,7 @@
                     "line": 1,
                     "column": 27
                   }
-                },
-                "range": [
-                  21,
-                  27
-                ]
+                }
               }
             }
           },
@@ -150,10 +122,6 @@
                 "column": 43
               }
             },
-            "range": [
-              29,
-              43
-            ],
             "name": "strVal",
             "typeAnnotation": {
               "type": "TypeAnnotation",
@@ -169,10 +137,6 @@
                   "column": 43
                 }
               },
-              "range": [
-                35,
-                43
-              ],
               "typeAnnotation": {
                 "type": "StringTypeAnnotation",
                 "start": 37,
@@ -186,11 +150,7 @@
                     "line": 1,
                     "column": 43
                   }
-                },
-                "range": [
-                  37,
-                  43
-                ]
+                }
               }
             }
           }
@@ -209,13 +169,10 @@
               "column": 46
             }
           },
-          "range": [
-            44,
-            46
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/30/expected.json b/test/fixtures/flow/type-annotations/30/expected.json
index dca8ca420e..f2d9219592 100644
--- a/test/fixtures/flow/type-annotations/30/expected.json
+++ b/test/fixtures/flow/type-annotations/30/expected.json
@@ -12,10 +12,6 @@
       "column": 18
     }
   },
-  "range": [
-    0,
-    18
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 18
       }
     },
-    "range": [
-      0,
-      18
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 18
           }
         },
-        "range": [
-          0,
-          18
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 17
               }
             },
-            "range": [
-              4,
-              17
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 17
                 }
               },
-              "range": [
-                4,
-                17
-              ],
               "name": "numVal",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 17
                   }
                 },
-                "range": [
-                  10,
-                  17
-                ],
                 "typeAnnotation": {
                   "type": "NumberTypeAnnotation",
                   "start": 11,
@@ -123,11 +99,7 @@
                       "line": 1,
                       "column": 17
                     }
-                  },
-                  "range": [
-                    11,
-                    17
-                  ]
+                  }
                 }
               }
             },
@@ -137,5 +109,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/31/expected.json b/test/fixtures/flow/type-annotations/31/expected.json
index 2309396519..c885a0e4d9 100644
--- a/test/fixtures/flow/type-annotations/31/expected.json
+++ b/test/fixtures/flow/type-annotations/31/expected.json
@@ -12,10 +12,6 @@
       "column": 32
     }
   },
-  "range": [
-    0,
-    32
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 32
       }
     },
-    "range": [
-      0,
-      32
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 32
           }
         },
-        "range": [
-          0,
-          32
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 31
               }
             },
-            "range": [
-              4,
-              31
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 17
                 }
               },
-              "range": [
-                4,
-                17
-              ],
               "name": "numVal",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 17
                   }
                 },
-                "range": [
-                  10,
-                  17
-                ],
                 "typeAnnotation": {
                   "type": "NumberTypeAnnotation",
                   "start": 11,
@@ -123,11 +99,7 @@
                       "line": 1,
                       "column": 17
                     }
-                  },
-                  "range": [
-                    11,
-                    17
-                  ]
+                  }
                 }
               }
             },
@@ -145,10 +117,6 @@
                   "column": 31
                 }
               },
-              "range": [
-                20,
-                31
-              ],
               "name": "otherNumVal"
             }
           }
@@ -156,5 +124,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/32/expected.json b/test/fixtures/flow/type-annotations/32/expected.json
index d00a84a079..e635f2e773 100644
--- a/test/fixtures/flow/type-annotations/32/expected.json
+++ b/test/fixtures/flow/type-annotations/32/expected.json
@@ -12,10 +12,6 @@
       "column": 24
     }
   },
-  "range": [
-    0,
-    24
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 24
       }
     },
-    "range": [
-      0,
-      24
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 24
           }
         },
-        "range": [
-          0,
-          24
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 23
               }
             },
-            "range": [
-              4,
-              23
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 23
                 }
               },
-              "range": [
-                4,
-                23
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 23
                   }
                 },
-                "range": [
-                  5,
-                  23
-                ],
                 "typeAnnotation": {
                   "type": "ObjectTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 23
                     }
                   },
-                  "range": [
-                    7,
-                    23
-                  ],
                   "callProperties": [],
                   "properties": [
                     {
@@ -144,10 +116,6 @@
                           "column": 22
                         }
                       },
-                      "range": [
-                        8,
-                        22
-                      ],
                       "key": {
                         "type": "Identifier",
                         "start": 8,
@@ -162,10 +130,6 @@
                             "column": 14
                           }
                         },
-                        "range": [
-                          8,
-                          14
-                        ],
                         "name": "numVal"
                       },
                       "value": {
@@ -181,11 +145,7 @@
                             "line": 1,
                             "column": 22
                           }
-                        },
-                        "range": [
-                          16,
-                          22
-                        ]
+                        }
                       },
                       "optional": false
                     }
@@ -200,5 +160,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/33/expected.json b/test/fixtures/flow/type-annotations/33/expected.json
index acdc41cb63..379f052e3b 100644
--- a/test/fixtures/flow/type-annotations/33/expected.json
+++ b/test/fixtures/flow/type-annotations/33/expected.json
@@ -12,10 +12,6 @@
       "column": 25
     }
   },
-  "range": [
-    0,
-    25
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 25
       }
     },
-    "range": [
-      0,
-      25
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 25
           }
         },
-        "range": [
-          0,
-          25
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 24
               }
             },
-            "range": [
-              4,
-              24
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 24
                 }
               },
-              "range": [
-                4,
-                24
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 24
                   }
                 },
-                "range": [
-                  5,
-                  24
-                ],
                 "typeAnnotation": {
                   "type": "ObjectTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 24
                     }
                   },
-                  "range": [
-                    7,
-                    24
-                  ],
                   "callProperties": [],
                   "properties": [
                     {
@@ -144,10 +116,6 @@
                           "column": 23
                         }
                       },
-                      "range": [
-                        8,
-                        23
-                      ],
                       "key": {
                         "type": "Identifier",
                         "start": 8,
@@ -162,10 +130,6 @@
                             "column": 14
                           }
                         },
-                        "range": [
-                          8,
-                          14
-                        ],
                         "name": "numVal"
                       },
                       "value": {
@@ -181,11 +145,7 @@
                             "line": 1,
                             "column": 22
                           }
-                        },
-                        "range": [
-                          16,
-                          22
-                        ]
+                        }
                       },
                       "optional": false
                     }
@@ -200,5 +160,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/34/expected.json b/test/fixtures/flow/type-annotations/34/expected.json
index 0cd0e5330a..a8e74adb3e 100644
--- a/test/fixtures/flow/type-annotations/34/expected.json
+++ b/test/fixtures/flow/type-annotations/34/expected.json
@@ -12,10 +12,6 @@
       "column": 51
     }
   },
-  "range": [
-    0,
-    51
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 51
       }
     },
-    "range": [
-      0,
-      51
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 51
           }
         },
-        "range": [
-          0,
-          51
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 50
               }
             },
-            "range": [
-              4,
-              50
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 50
                 }
               },
-              "range": [
-                4,
-                50
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 50
                   }
                 },
-                "range": [
-                  5,
-                  50
-                ],
                 "typeAnnotation": {
                   "type": "ObjectTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 50
                     }
                   },
-                  "range": [
-                    7,
-                    50
-                  ],
                   "callProperties": [],
                   "properties": [
                     {
@@ -144,10 +116,6 @@
                           "column": 23
                         }
                       },
-                      "range": [
-                        8,
-                        23
-                      ],
                       "key": {
                         "type": "Identifier",
                         "start": 8,
@@ -162,10 +130,6 @@
                             "column": 14
                           }
                         },
-                        "range": [
-                          8,
-                          14
-                        ],
                         "name": "numVal"
                       },
                       "value": {
@@ -181,11 +145,7 @@
                             "line": 1,
                             "column": 22
                           }
-                        },
-                        "range": [
-                          16,
-                          22
-                        ]
+                        }
                       },
                       "optional": false
                     }
@@ -205,10 +165,6 @@
                           "column": 49
                         }
                       },
-                      "range": [
-                        24,
-                        49
-                      ],
                       "id": {
                         "type": "Identifier",
                         "start": 25,
@@ -223,10 +179,6 @@
                             "column": 32
                           }
                         },
-                        "range": [
-                          25,
-                          32
-                        ],
                         "name": "indexer"
                       },
                       "key": {
@@ -242,11 +194,7 @@
                             "line": 1,
                             "column": 40
                           }
-                        },
-                        "range": [
-                          34,
-                          40
-                        ]
+                        }
                       },
                       "value": {
                         "type": "NumberTypeAnnotation",
@@ -261,11 +209,7 @@
                             "line": 1,
                             "column": 49
                           }
-                        },
-                        "range": [
-                          43,
-                          49
-                        ]
+                        }
                       }
                     }
                   ]
@@ -278,5 +222,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/35/expected.json b/test/fixtures/flow/type-annotations/35/expected.json
index 2b9de38f4e..5ecc7fb5b7 100644
--- a/test/fixtures/flow/type-annotations/35/expected.json
+++ b/test/fixtures/flow/type-annotations/35/expected.json
@@ -12,10 +12,6 @@
       "column": 25
     }
   },
-  "range": [
-    0,
-    25
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 25
       }
     },
-    "range": [
-      0,
-      25
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 25
           }
         },
-        "range": [
-          0,
-          25
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 24
               }
             },
-            "range": [
-              4,
-              24
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 24
                 }
               },
-              "range": [
-                4,
-                24
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 24
                   }
                 },
-                "range": [
-                  5,
-                  24
-                ],
                 "typeAnnotation": {
                   "type": "NullableTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 24
                     }
                   },
-                  "range": [
-                    7,
-                    24
-                  ],
                   "typeAnnotation": {
                     "type": "ObjectTypeAnnotation",
                     "start": 8,
@@ -142,10 +114,6 @@
                         "column": 24
                       }
                     },
-                    "range": [
-                      8,
-                      24
-                    ],
                     "callProperties": [],
                     "properties": [
                       {
@@ -162,10 +130,6 @@
                             "column": 23
                           }
                         },
-                        "range": [
-                          9,
-                          23
-                        ],
                         "key": {
                           "type": "Identifier",
                           "start": 9,
@@ -180,10 +144,6 @@
                               "column": 15
                             }
                           },
-                          "range": [
-                            9,
-                            15
-                          ],
                           "name": "numVal"
                         },
                         "value": {
@@ -199,11 +159,7 @@
                               "line": 1,
                               "column": 23
                             }
-                          },
-                          "range": [
-                            17,
-                            23
-                          ]
+                          }
                         },
                         "optional": false
                       }
@@ -219,5 +175,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/36/expected.json b/test/fixtures/flow/type-annotations/36/expected.json
index 9093975008..b461873b82 100644
--- a/test/fixtures/flow/type-annotations/36/expected.json
+++ b/test/fixtures/flow/type-annotations/36/expected.json
@@ -12,10 +12,6 @@
       "column": 39
     }
   },
-  "range": [
-    0,
-    39
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 39
       }
     },
-    "range": [
-      0,
-      39
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 39
           }
         },
-        "range": [
-          0,
-          39
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 39
               }
             },
-            "range": [
-              4,
-              39
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 39
                 }
               },
-              "range": [
-                4,
-                39
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 39
                   }
                 },
-                "range": [
-                  5,
-                  39
-                ],
                 "typeAnnotation": {
                   "type": "ObjectTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 39
                     }
                   },
-                  "range": [
-                    7,
-                    39
-                  ],
                   "callProperties": [],
                   "properties": [
                     {
@@ -144,10 +116,6 @@
                           "column": 23
                         }
                       },
-                      "range": [
-                        8,
-                        23
-                      ],
                       "key": {
                         "type": "Identifier",
                         "start": 8,
@@ -162,10 +130,6 @@
                             "column": 14
                           }
                         },
-                        "range": [
-                          8,
-                          14
-                        ],
                         "name": "numVal"
                       },
                       "value": {
@@ -181,11 +145,7 @@
                             "line": 1,
                             "column": 22
                           }
-                        },
-                        "range": [
-                          16,
-                          22
-                        ]
+                        }
                       },
                       "optional": false
                     },
@@ -203,10 +163,6 @@
                           "column": 38
                         }
                       },
-                      "range": [
-                        24,
-                        38
-                      ],
                       "key": {
                         "type": "Identifier",
                         "start": 24,
@@ -221,10 +177,6 @@
                             "column": 30
                           }
                         },
-                        "range": [
-                          24,
-                          30
-                        ],
                         "name": "strVal"
                       },
                       "value": {
@@ -240,11 +192,7 @@
                             "line": 1,
                             "column": 38
                           }
-                        },
-                        "range": [
-                          32,
-                          38
-                        ]
+                        }
                       },
                       "optional": false
                     }
@@ -259,5 +207,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/37/expected.json b/test/fixtures/flow/type-annotations/37/expected.json
index 5aa79b3015..3082874e1b 100644
--- a/test/fixtures/flow/type-annotations/37/expected.json
+++ b/test/fixtures/flow/type-annotations/37/expected.json
@@ -12,10 +12,6 @@
       "column": 33
     }
   },
-  "range": [
-    0,
-    33
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 33
       }
     },
-    "range": [
-      0,
-      33
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 33
           }
         },
-        "range": [
-          0,
-          33
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 33
               }
             },
-            "range": [
-              4,
-              33
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 33
                 }
               },
-              "range": [
-                4,
-                33
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 33
                   }
                 },
-                "range": [
-                  5,
-                  33
-                ],
                 "typeAnnotation": {
                   "type": "ObjectTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 33
                     }
                   },
-                  "range": [
-                    7,
-                    33
-                  ],
                   "callProperties": [],
                   "properties": [
                     {
@@ -144,10 +116,6 @@
                           "column": 32
                         }
                       },
-                      "range": [
-                        8,
-                        32
-                      ],
                       "key": {
                         "type": "Identifier",
                         "start": 8,
@@ -162,10 +130,6 @@
                             "column": 14
                           }
                         },
-                        "range": [
-                          8,
-                          14
-                        ],
                         "name": "subObj"
                       },
                       "value": {
@@ -182,10 +146,6 @@
                             "column": 32
                           }
                         },
-                        "range": [
-                          16,
-                          32
-                        ],
                         "callProperties": [],
                         "properties": [
                           {
@@ -202,10 +162,6 @@
                                 "column": 31
                               }
                             },
-                            "range": [
-                              17,
-                              31
-                            ],
                             "key": {
                               "type": "Identifier",
                               "start": 17,
@@ -220,10 +176,6 @@
                                   "column": 23
                                 }
                               },
-                              "range": [
-                                17,
-                                23
-                              ],
                               "name": "strVal"
                             },
                             "value": {
@@ -239,11 +191,7 @@
                                   "line": 1,
                                   "column": 31
                                 }
-                              },
-                              "range": [
-                                25,
-                                31
-                              ]
+                              }
                             },
                             "optional": false
                           }
@@ -263,5 +211,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/38/expected.json b/test/fixtures/flow/type-annotations/38/expected.json
index 3a78c154cd..110e4bb063 100644
--- a/test/fixtures/flow/type-annotations/38/expected.json
+++ b/test/fixtures/flow/type-annotations/38/expected.json
@@ -12,10 +12,6 @@
       "column": 34
     }
   },
-  "range": [
-    0,
-    34
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 34
       }
     },
-    "range": [
-      0,
-      34
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 34
           }
         },
-        "range": [
-          0,
-          34
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 34
               }
             },
-            "range": [
-              4,
-              34
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 34
                 }
               },
-              "range": [
-                4,
-                34
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 34
                   }
                 },
-                "range": [
-                  5,
-                  34
-                ],
                 "typeAnnotation": {
                   "type": "ObjectTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 34
                     }
                   },
-                  "range": [
-                    7,
-                    34
-                  ],
                   "callProperties": [],
                   "properties": [
                     {
@@ -144,10 +116,6 @@
                           "column": 33
                         }
                       },
-                      "range": [
-                        8,
-                        33
-                      ],
                       "key": {
                         "type": "Identifier",
                         "start": 8,
@@ -162,10 +130,6 @@
                             "column": 14
                           }
                         },
-                        "range": [
-                          8,
-                          14
-                        ],
                         "name": "subObj"
                       },
                       "value": {
@@ -182,10 +146,6 @@
                             "column": 33
                           }
                         },
-                        "range": [
-                          16,
-                          33
-                        ],
                         "typeAnnotation": {
                           "type": "ObjectTypeAnnotation",
                           "start": 17,
@@ -200,10 +160,6 @@
                               "column": 33
                             }
                           },
-                          "range": [
-                            17,
-                            33
-                          ],
                           "callProperties": [],
                           "properties": [
                             {
@@ -220,10 +176,6 @@
                                   "column": 32
                                 }
                               },
-                              "range": [
-                                18,
-                                32
-                              ],
                               "key": {
                                 "type": "Identifier",
                                 "start": 18,
@@ -238,10 +190,6 @@
                                     "column": 24
                                   }
                                 },
-                                "range": [
-                                  18,
-                                  24
-                                ],
                                 "name": "strVal"
                               },
                               "value": {
@@ -257,11 +205,7 @@
                                     "line": 1,
                                     "column": 32
                                   }
-                                },
-                                "range": [
-                                  26,
-                                  32
-                                ]
+                                }
                               },
                               "optional": false
                             }
@@ -282,5 +226,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/39/expected.json b/test/fixtures/flow/type-annotations/39/expected.json
index 40ec767918..25ed700944 100644
--- a/test/fixtures/flow/type-annotations/39/expected.json
+++ b/test/fixtures/flow/type-annotations/39/expected.json
@@ -12,10 +12,6 @@
       "column": 39
     }
   },
-  "range": [
-    0,
-    39
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 39
       }
     },
-    "range": [
-      0,
-      39
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 39
           }
         },
-        "range": [
-          0,
-          39
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 39
               }
             },
-            "range": [
-              4,
-              39
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 39
                 }
               },
-              "range": [
-                4,
-                39
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 39
                   }
                 },
-                "range": [
-                  5,
-                  39
-                ],
                 "typeAnnotation": {
                   "type": "ObjectTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 39
                     }
                   },
-                  "range": [
-                    7,
-                    39
-                  ],
                   "callProperties": [],
                   "properties": [
                     {
@@ -144,10 +116,6 @@
                           "column": 23
                         }
                       },
-                      "range": [
-                        8,
-                        23
-                      ],
                       "key": {
                         "type": "Identifier",
                         "start": 8,
@@ -162,10 +130,6 @@
                             "column": 14
                           }
                         },
-                        "range": [
-                          8,
-                          14
-                        ],
                         "name": "param1"
                       },
                       "value": {
@@ -181,11 +145,7 @@
                             "line": 1,
                             "column": 22
                           }
-                        },
-                        "range": [
-                          16,
-                          22
-                        ]
+                        }
                       },
                       "optional": false
                     },
@@ -203,10 +163,6 @@
                           "column": 38
                         }
                       },
-                      "range": [
-                        24,
-                        38
-                      ],
                       "key": {
                         "type": "Identifier",
                         "start": 24,
@@ -221,10 +177,6 @@
                             "column": 30
                           }
                         },
-                        "range": [
-                          24,
-                          30
-                        ],
                         "name": "param2"
                       },
                       "value": {
@@ -240,11 +192,7 @@
                             "line": 1,
                             "column": 38
                           }
-                        },
-                        "range": [
-                          32,
-                          38
-                        ]
+                        }
                       },
                       "optional": false
                     }
@@ -259,5 +207,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/4/expected.json b/test/fixtures/flow/type-annotations/4/expected.json
index 7ce85f36ab..5af1d4df75 100644
--- a/test/fixtures/flow/type-annotations/4/expected.json
+++ b/test/fixtures/flow/type-annotations/4/expected.json
@@ -12,10 +12,6 @@
       "column": 42
     }
   },
-  "range": [
-    0,
-    42
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 42
       }
     },
-    "range": [
-      0,
-      42
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 42
           }
         },
-        "range": [
-          0,
-          42
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            9,
-            12
-          ],
           "name": "foo"
         },
         "generator": false,
@@ -92,10 +76,6 @@
                 "column": 27
               }
             },
-            "range": [
-              13,
-              27
-            ],
             "name": "numVal",
             "typeAnnotation": {
               "type": "TypeAnnotation",
@@ -111,10 +91,6 @@
                   "column": 27
                 }
               },
-              "range": [
-                19,
-                27
-              ],
               "typeAnnotation": {
                 "type": "NumberTypeAnnotation",
                 "start": 21,
@@ -128,11 +104,7 @@
                     "line": 1,
                     "column": 27
                   }
-                },
-                "range": [
-                  21,
-                  27
-                ]
+                }
               }
             }
           },
@@ -150,10 +122,6 @@
                 "column": 39
               }
             },
-            "range": [
-              29,
-              39
-            ],
             "name": "untypedVal"
           }
         ],
@@ -171,13 +139,10 @@
               "column": 42
             }
           },
-          "range": [
-            40,
-            42
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/40/expected.json b/test/fixtures/flow/type-annotations/40/expected.json
index c5ecc72929..b0202c430f 100644
--- a/test/fixtures/flow/type-annotations/40/expected.json
+++ b/test/fixtures/flow/type-annotations/40/expected.json
@@ -12,10 +12,6 @@
       "column": 40
     }
   },
-  "range": [
-    0,
-    40
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 40
       }
     },
-    "range": [
-      0,
-      40
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 40
           }
         },
-        "range": [
-          0,
-          40
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 40
               }
             },
-            "range": [
-              4,
-              40
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 40
                 }
               },
-              "range": [
-                4,
-                40
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 40
                   }
                 },
-                "range": [
-                  5,
-                  40
-                ],
                 "typeAnnotation": {
                   "type": "ObjectTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 40
                     }
                   },
-                  "range": [
-                    7,
-                    40
-                  ],
                   "callProperties": [],
                   "properties": [
                     {
@@ -144,10 +116,6 @@
                           "column": 23
                         }
                       },
-                      "range": [
-                        8,
-                        23
-                      ],
                       "key": {
                         "type": "Identifier",
                         "start": 8,
@@ -162,10 +130,6 @@
                             "column": 14
                           }
                         },
-                        "range": [
-                          8,
-                          14
-                        ],
                         "name": "param1"
                       },
                       "value": {
@@ -181,11 +145,7 @@
                             "line": 1,
                             "column": 22
                           }
-                        },
-                        "range": [
-                          16,
-                          22
-                        ]
+                        }
                       },
                       "optional": false
                     },
@@ -203,10 +163,6 @@
                           "column": 39
                         }
                       },
-                      "range": [
-                        24,
-                        39
-                      ],
                       "key": {
                         "type": "Identifier",
                         "start": 24,
@@ -221,10 +177,6 @@
                             "column": 30
                           }
                         },
-                        "range": [
-                          24,
-                          30
-                        ],
                         "name": "param2"
                       },
                       "value": {
@@ -240,11 +192,7 @@
                             "line": 1,
                             "column": 39
                           }
-                        },
-                        "range": [
-                          33,
-                          39
-                        ]
+                        }
                       },
                       "optional": true
                     }
@@ -259,5 +207,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/41/expected.json b/test/fixtures/flow/type-annotations/41/expected.json
index 96398e457e..cb969401e0 100644
--- a/test/fixtures/flow/type-annotations/41/expected.json
+++ b/test/fixtures/flow/type-annotations/41/expected.json
@@ -12,10 +12,6 @@
       "column": 53
     }
   },
-  "range": [
-    0,
-    53
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 53
       }
     },
-    "range": [
-      0,
-      53
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 53
           }
         },
-        "range": [
-          0,
-          53
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 52
               }
             },
-            "range": [
-              4,
-              52
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 52
                 }
               },
-              "range": [
-                4,
-                52
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 52
                   }
                 },
-                "range": [
-                  5,
-                  52
-                ],
                 "typeAnnotation": {
                   "type": "ObjectTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 52
                     }
                   },
-                  "range": [
-                    7,
-                    52
-                  ],
                   "callProperties": [],
                   "properties": [],
                   "indexers": [
@@ -145,10 +117,6 @@
                           "column": 29
                         }
                       },
-                      "range": [
-                        9,
-                        29
-                      ],
                       "id": {
                         "type": "Identifier",
                         "start": 10,
@@ -163,10 +131,6 @@
                             "column": 11
                           }
                         },
-                        "range": [
-                          10,
-                          11
-                        ],
                         "name": "a"
                       },
                       "key": {
@@ -182,11 +146,7 @@
                             "line": 1,
                             "column": 19
                           }
-                        },
-                        "range": [
-                          13,
-                          19
-                        ]
+                        }
                       },
                       "value": {
                         "type": "StringTypeAnnotation",
@@ -201,11 +161,7 @@
                             "line": 1,
                             "column": 28
                           }
-                        },
-                        "range": [
-                          22,
-                          28
-                        ]
+                        }
                       }
                     },
                     {
@@ -222,10 +178,6 @@
                           "column": 50
                         }
                       },
-                      "range": [
-                        30,
-                        50
-                      ],
                       "id": {
                         "type": "Identifier",
                         "start": 31,
@@ -240,10 +192,6 @@
                             "column": 32
                           }
                         },
-                        "range": [
-                          31,
-                          32
-                        ],
                         "name": "b"
                       },
                       "key": {
@@ -259,11 +207,7 @@
                             "line": 1,
                             "column": 40
                           }
-                        },
-                        "range": [
-                          34,
-                          40
-                        ]
+                        }
                       },
                       "value": {
                         "type": "StringTypeAnnotation",
@@ -278,11 +222,7 @@
                             "line": 1,
                             "column": 49
                           }
-                        },
-                        "range": [
-                          43,
-                          49
-                        ]
+                        }
                       }
                     }
                   ]
@@ -295,5 +235,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/42/expected.json b/test/fixtures/flow/type-annotations/42/expected.json
index 9c2be00f41..41e59eda82 100644
--- a/test/fixtures/flow/type-annotations/42/expected.json
+++ b/test/fixtures/flow/type-annotations/42/expected.json
@@ -12,10 +12,6 @@
       "column": 48
     }
   },
-  "range": [
-    0,
-    48
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 48
       }
     },
-    "range": [
-      0,
-      48
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 48
           }
         },
-        "range": [
-          0,
-          48
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 48
               }
             },
-            "range": [
-              4,
-              48
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 48
                 }
               },
-              "range": [
-                4,
-                48
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 48
                   }
                 },
-                "range": [
-                  5,
-                  48
-                ],
                 "typeAnnotation": {
                   "type": "ObjectTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 48
                     }
                   },
-                  "range": [
-                    7,
-                    48
-                  ],
                   "callProperties": [],
                   "properties": [
                     {
@@ -144,10 +116,6 @@
                           "column": 47
                         }
                       },
-                      "range": [
-                        8,
-                        47
-                      ],
                       "value": {
                         "type": "FunctionTypeAnnotation",
                         "start": 8,
@@ -162,10 +130,6 @@
                             "column": 47
                           }
                         },
-                        "range": [
-                          8,
-                          47
-                        ],
                         "params": [
                           {
                             "type": "FunctionTypeParam",
@@ -181,10 +145,6 @@
                                 "column": 20
                               }
                             },
-                            "range": [
-                              12,
-                              20
-                            ],
                             "name": {
                               "type": "Identifier",
                               "start": 12,
@@ -199,10 +159,6 @@
                                   "column": 13
                                 }
                               },
-                              "range": [
-                                12,
-                                13
-                              ],
                               "name": "x"
                             },
                             "optional": false,
@@ -219,11 +175,7 @@
                                   "line": 1,
                                   "column": 20
                                 }
-                              },
-                              "range": [
-                                14,
-                                20
-                              ]
+                              }
                             }
                           }
                         ],
@@ -241,10 +193,6 @@
                               "column": 40
                             }
                           },
-                          "range": [
-                            25,
-                            40
-                          ],
                           "name": {
                             "type": "Identifier",
                             "start": 25,
@@ -259,10 +207,6 @@
                                 "column": 26
                               }
                             },
-                            "range": [
-                              25,
-                              26
-                            ],
                             "name": "y"
                           },
                           "optional": false,
@@ -280,10 +224,6 @@
                                 "column": 40
                               }
                             },
-                            "range": [
-                              27,
-                              40
-                            ],
                             "typeParameters": {
                               "type": "TypeParameterInstantiation",
                               "start": 32,
@@ -298,10 +238,6 @@
                                   "column": 40
                                 }
                               },
-                              "range": [
-                                32,
-                                40
-                              ],
                               "params": [
                                 {
                                   "type": "StringTypeAnnotation",
@@ -316,11 +252,7 @@
                                       "line": 1,
                                       "column": 39
                                     }
-                                  },
-                                  "range": [
-                                    33,
-                                    39
-                                  ]
+                                  }
                                 }
                               ]
                             },
@@ -338,10 +270,6 @@
                                   "column": 32
                                 }
                               },
-                              "range": [
-                                27,
-                                32
-                              ],
                               "name": "Array"
                             }
                           }
@@ -360,11 +288,7 @@
                               "line": 1,
                               "column": 47
                             }
-                          },
-                          "range": [
-                            43,
-                            47
-                          ]
+                          }
                         }
                       },
                       "key": {
@@ -381,10 +305,6 @@
                             "column": 11
                           }
                         },
-                        "range": [
-                          8,
-                          11
-                        ],
                         "name": "add"
                       },
                       "optional": false
@@ -400,5 +320,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/43/expected.json b/test/fixtures/flow/type-annotations/43/expected.json
index e42a7d9b4d..fb516f6969 100644
--- a/test/fixtures/flow/type-annotations/43/expected.json
+++ b/test/fixtures/flow/type-annotations/43/expected.json
@@ -12,10 +12,6 @@
       "column": 26
     }
   },
-  "range": [
-    0,
-    26
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 26
       }
     },
-    "range": [
-      0,
-      26
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 26
           }
         },
-        "range": [
-          0,
-          26
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 26
               }
             },
-            "range": [
-              4,
-              26
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 26
                 }
               },
-              "range": [
-                4,
-                26
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 26
                   }
                 },
-                "range": [
-                  5,
-                  26
-                ],
                 "typeAnnotation": {
                   "type": "ObjectTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 26
                     }
                   },
-                  "range": [
-                    7,
-                    26
-                  ],
                   "callProperties": [],
                   "properties": [
                     {
@@ -144,10 +116,6 @@
                           "column": 24
                         }
                       },
-                      "range": [
-                        9,
-                        24
-                      ],
                       "value": {
                         "type": "FunctionTypeAnnotation",
                         "start": 9,
@@ -162,10 +130,6 @@
                             "column": 23
                           }
                         },
-                        "range": [
-                          9,
-                          23
-                        ],
                         "params": [
                           {
                             "type": "FunctionTypeParam",
@@ -181,10 +145,6 @@
                                 "column": 19
                               }
                             },
-                            "range": [
-                              15,
-                              19
-                            ],
                             "name": {
                               "type": "Identifier",
                               "start": 15,
@@ -199,10 +159,6 @@
                                   "column": 16
                                 }
                               },
-                              "range": [
-                                15,
-                                16
-                              ],
                               "name": "x"
                             },
                             "optional": false,
@@ -220,10 +176,6 @@
                                   "column": 19
                                 }
                               },
-                              "range": [
-                                18,
-                                19
-                              ],
                               "typeParameters": null,
                               "id": {
                                 "type": "Identifier",
@@ -239,10 +191,6 @@
                                     "column": 19
                                   }
                                 },
-                                "range": [
-                                  18,
-                                  19
-                                ],
                                 "name": "T"
                               }
                             }
@@ -263,10 +211,6 @@
                               "column": 14
                             }
                           },
-                          "range": [
-                            11,
-                            14
-                          ],
                           "params": [
                             {
                               "type": "Identifier",
@@ -282,10 +226,6 @@
                                   "column": 13
                                 }
                               },
-                              "range": [
-                                12,
-                                13
-                              ],
                               "name": "T"
                             }
                           ]
@@ -304,10 +244,6 @@
                               "column": 23
                             }
                           },
-                          "range": [
-                            22,
-                            23
-                          ],
                           "typeParameters": null,
                           "id": {
                             "type": "Identifier",
@@ -323,10 +259,6 @@
                                 "column": 23
                               }
                             },
-                            "range": [
-                              22,
-                              23
-                            ],
                             "name": "T"
                           }
                         }
@@ -345,10 +277,6 @@
                             "column": 11
                           }
                         },
-                        "range": [
-                          9,
-                          11
-                        ],
                         "name": "id"
                       },
                       "optional": false
@@ -364,5 +292,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/44/expected.json b/test/fixtures/flow/type-annotations/44/expected.json
index b027843b97..98db1ba294 100644
--- a/test/fixtures/flow/type-annotations/44/expected.json
+++ b/test/fixtures/flow/type-annotations/44/expected.json
@@ -12,10 +12,6 @@
       "column": 31
     }
   },
-  "range": [
-    0,
-    31
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 31
       }
     },
-    "range": [
-      0,
-      31
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 31
           }
         },
-        "range": [
-          0,
-          31
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 31
               }
             },
-            "range": [
-              4,
-              31
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 19
                 }
               },
-              "range": [
-                4,
-                19
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 19
                   }
                 },
-                "range": [
-                  5,
-                  19
-                ],
                 "typeAnnotation": {
                   "type": "GenericTypeAnnotation",
                   "start": 6,
@@ -124,10 +100,6 @@
                       "column": 19
                     }
                   },
-                  "range": [
-                    6,
-                    19
-                  ],
                   "typeParameters": {
                     "type": "TypeParameterInstantiation",
                     "start": 11,
@@ -142,10 +114,6 @@
                         "column": 19
                       }
                     },
-                    "range": [
-                      11,
-                      19
-                    ],
                     "params": [
                       {
                         "type": "NumberTypeAnnotation",
@@ -160,11 +128,7 @@
                             "line": 1,
                             "column": 18
                           }
-                        },
-                        "range": [
-                          12,
-                          18
-                        ]
+                        }
                       }
                     ]
                   },
@@ -182,10 +146,6 @@
                         "column": 11
                       }
                     },
-                    "range": [
-                      6,
-                      11
-                    ],
                     "name": "Array"
                   }
                 }
@@ -205,10 +165,6 @@
                   "column": 31
                 }
               },
-              "range": [
-                22,
-                31
-              ],
               "elements": [
                 {
                   "type": "Literal",
@@ -224,10 +180,6 @@
                       "column": 24
                     }
                   },
-                  "range": [
-                    23,
-                    24
-                  ],
                   "value": 1,
                   "rawValue": 1,
                   "raw": "1"
@@ -246,10 +198,6 @@
                       "column": 27
                     }
                   },
-                  "range": [
-                    26,
-                    27
-                  ],
                   "value": 2,
                   "rawValue": 2,
                   "raw": "2"
@@ -268,10 +216,6 @@
                       "column": 30
                     }
                   },
-                  "range": [
-                    29,
-                    30
-                  ],
                   "value": 3,
                   "rawValue": 3,
                   "raw": "3"
@@ -283,5 +227,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/45/expected.json b/test/fixtures/flow/type-annotations/45/expected.json
index eb5d7b33da..255833b40c 100644
--- a/test/fixtures/flow/type-annotations/45/expected.json
+++ b/test/fixtures/flow/type-annotations/45/expected.json
@@ -12,10 +12,6 @@
       "column": 20
     }
   },
-  "range": [
-    0,
-    20
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 20
       }
     },
-    "range": [
-      0,
-      20
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 20
           }
         },
-        "range": [
-          0,
-          20
-        ],
         "expression": {
           "type": "AssignmentExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 20
             }
           },
-          "range": [
-            0,
-            20
-          ],
           "operator": "=",
           "left": {
             "type": "Identifier",
@@ -87,10 +71,6 @@
                 "column": 1
               }
             },
-            "range": [
-              0,
-              1
-            ],
             "name": "a"
           },
           "right": {
@@ -107,10 +87,6 @@
                 "column": 20
               }
             },
-            "range": [
-              4,
-              20
-            ],
             "id": {
               "type": "Identifier",
               "start": 10,
@@ -125,10 +101,6 @@
                   "column": 13
                 }
               },
-              "range": [
-                10,
-                13
-              ],
               "name": "Foo"
             },
             "typeParameters": {
@@ -145,10 +117,6 @@
                   "column": 16
                 }
               },
-              "range": [
-                13,
-                16
-              ],
               "params": [
                 {
                   "type": "Identifier",
@@ -164,10 +132,6 @@
                       "column": 15
                     }
                   },
-                  "range": [
-                    14,
-                    15
-                  ],
                   "name": "T"
                 }
               ]
@@ -187,15 +151,12 @@
                   "column": 20
                 }
               },
-              "range": [
-                17,
-                20
-              ],
               "body": []
             }
           }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/46/expected.json b/test/fixtures/flow/type-annotations/46/expected.json
index 2ea6469bc6..863778bd30 100644
--- a/test/fixtures/flow/type-annotations/46/expected.json
+++ b/test/fixtures/flow/type-annotations/46/expected.json
@@ -12,10 +12,6 @@
       "column": 35
     }
   },
-  "range": [
-    0,
-    35
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 35
       }
     },
-    "range": [
-      0,
-      35
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 35
           }
         },
-        "range": [
-          0,
-          35
-        ],
         "expression": {
           "type": "AssignmentExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 35
             }
           },
-          "range": [
-            0,
-            35
-          ],
           "operator": "=",
           "left": {
             "type": "Identifier",
@@ -87,10 +71,6 @@
                 "column": 1
               }
             },
-            "range": [
-              0,
-              1
-            ],
             "name": "a"
           },
           "right": {
@@ -107,10 +87,6 @@
                 "column": 35
               }
             },
-            "range": [
-              4,
-              35
-            ],
             "id": {
               "type": "Identifier",
               "start": 10,
@@ -125,10 +101,6 @@
                   "column": 13
                 }
               },
-              "range": [
-                10,
-                13
-              ],
               "name": "Foo"
             },
             "typeParameters": {
@@ -145,10 +117,6 @@
                   "column": 16
                 }
               },
-              "range": [
-                13,
-                16
-              ],
               "params": [
                 {
                   "type": "Identifier",
@@ -164,10 +132,6 @@
                       "column": 15
                     }
                   },
-                  "range": [
-                    14,
-                    15
-                  ],
                   "name": "T"
                 }
               ]
@@ -186,10 +150,6 @@
                   "column": 28
                 }
               },
-              "range": [
-                25,
-                28
-              ],
               "name": "Bar"
             },
             "superTypeParameters": {
@@ -206,10 +166,6 @@
                   "column": 31
                 }
               },
-              "range": [
-                28,
-                31
-              ],
               "params": [
                 {
                   "type": "GenericTypeAnnotation",
@@ -225,10 +181,6 @@
                       "column": 30
                     }
                   },
-                  "range": [
-                    29,
-                    30
-                  ],
                   "typeParameters": null,
                   "id": {
                     "type": "Identifier",
@@ -244,10 +196,6 @@
                         "column": 30
                       }
                     },
-                    "range": [
-                      29,
-                      30
-                    ],
                     "name": "T"
                   }
                 }
@@ -267,15 +215,12 @@
                   "column": 35
                 }
               },
-              "range": [
-                32,
-                35
-              ],
               "body": []
             }
           }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/47/expected.json b/test/fixtures/flow/type-annotations/47/expected.json
index 0444ffe366..cd819c41b9 100644
--- a/test/fixtures/flow/type-annotations/47/expected.json
+++ b/test/fixtures/flow/type-annotations/47/expected.json
@@ -12,10 +12,6 @@
       "column": 15
     }
   },
-  "range": [
-    0,
-    15
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 15
       }
     },
-    "range": [
-      0,
-      15
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 15
           }
         },
-        "range": [
-          0,
-          15
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 9
             }
           },
-          "range": [
-            6,
-            9
-          ],
           "name": "Foo"
         },
         "typeParameters": {
@@ -88,10 +72,6 @@
               "column": 12
             }
           },
-          "range": [
-            9,
-            12
-          ],
           "params": [
             {
               "type": "Identifier",
@@ -107,10 +87,6 @@
                   "column": 11
                 }
               },
-              "range": [
-                10,
-                11
-              ],
               "name": "T"
             }
           ]
@@ -130,13 +106,10 @@
               "column": 15
             }
           },
-          "range": [
-            13,
-            15
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/48/expected.json b/test/fixtures/flow/type-annotations/48/expected.json
index 785b8f31d3..9260e29e3f 100644
--- a/test/fixtures/flow/type-annotations/48/expected.json
+++ b/test/fixtures/flow/type-annotations/48/expected.json
@@ -12,10 +12,6 @@
       "column": 31
     }
   },
-  "range": [
-    0,
-    31
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 31
       }
     },
-    "range": [
-      0,
-      31
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 31
           }
         },
-        "range": [
-          0,
-          31
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 9
             }
           },
-          "range": [
-            6,
-            9
-          ],
           "name": "Foo"
         },
         "typeParameters": {
@@ -88,10 +72,6 @@
               "column": 12
             }
           },
-          "range": [
-            9,
-            12
-          ],
           "params": [
             {
               "type": "Identifier",
@@ -107,10 +87,6 @@
                   "column": 11
                 }
               },
-              "range": [
-                10,
-                11
-              ],
               "name": "T"
             }
           ]
@@ -129,10 +105,6 @@
               "column": 24
             }
           },
-          "range": [
-            21,
-            24
-          ],
           "name": "Bar"
         },
         "superTypeParameters": {
@@ -149,10 +121,6 @@
               "column": 27
             }
           },
-          "range": [
-            24,
-            27
-          ],
           "params": [
             {
               "type": "GenericTypeAnnotation",
@@ -168,10 +136,6 @@
                   "column": 26
                 }
               },
-              "range": [
-                25,
-                26
-              ],
               "typeParameters": null,
               "id": {
                 "type": "Identifier",
@@ -187,10 +151,6 @@
                     "column": 26
                   }
                 },
-                "range": [
-                  25,
-                  26
-                ],
                 "name": "T"
               }
             }
@@ -210,13 +170,10 @@
               "column": 31
             }
           },
-          "range": [
-            28,
-            31
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/49/expected.json b/test/fixtures/flow/type-annotations/49/expected.json
index ee26a61f91..320fd2bec5 100644
--- a/test/fixtures/flow/type-annotations/49/expected.json
+++ b/test/fixtures/flow/type-annotations/49/expected.json
@@ -12,10 +12,6 @@
       "column": 35
     }
   },
-  "range": [
-    0,
-    35
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 35
       }
     },
-    "range": [
-      0,
-      35
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 35
           }
         },
-        "range": [
-          0,
-          35
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 9
             }
           },
-          "range": [
-            6,
-            9
-          ],
           "name": "Foo"
         },
         "typeParameters": {
@@ -88,10 +72,6 @@
               "column": 12
             }
           },
-          "range": [
-            9,
-            12
-          ],
           "params": [
             {
               "type": "Identifier",
@@ -107,10 +87,6 @@
                   "column": 11
                 }
               },
-              "range": [
-                10,
-                11
-              ],
               "name": "T"
             }
           ]
@@ -129,10 +105,6 @@
               "column": 31
             }
           },
-          "range": [
-            21,
-            31
-          ],
           "callee": {
             "type": "Identifier",
             "start": 21,
@@ -147,10 +119,6 @@
                 "column": 26
               }
             },
-            "range": [
-              21,
-              26
-            ],
             "name": "mixin"
           },
           "arguments": [
@@ -168,10 +136,6 @@
                   "column": 30
                 }
               },
-              "range": [
-                27,
-                30
-              ],
               "name": "Bar"
             }
           ]
@@ -190,13 +154,10 @@
               "column": 35
             }
           },
-          "range": [
-            32,
-            35
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/5/expected.json b/test/fixtures/flow/type-annotations/5/expected.json
index f1a8bb2032..7eb48ca8f1 100644
--- a/test/fixtures/flow/type-annotations/5/expected.json
+++ b/test/fixtures/flow/type-annotations/5/expected.json
@@ -12,10 +12,6 @@
       "column": 42
     }
   },
-  "range": [
-    0,
-    42
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 42
       }
     },
-    "range": [
-      0,
-      42
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 42
           }
         },
-        "range": [
-          0,
-          42
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            9,
-            12
-          ],
           "name": "foo"
         },
         "generator": false,
@@ -92,10 +76,6 @@
                 "column": 23
               }
             },
-            "range": [
-              13,
-              23
-            ],
             "name": "untypedVal"
           },
           {
@@ -112,10 +92,6 @@
                 "column": 39
               }
             },
-            "range": [
-              25,
-              39
-            ],
             "name": "numVal",
             "typeAnnotation": {
               "type": "TypeAnnotation",
@@ -131,10 +107,6 @@
                   "column": 39
                 }
               },
-              "range": [
-                31,
-                39
-              ],
               "typeAnnotation": {
                 "type": "NumberTypeAnnotation",
                 "start": 33,
@@ -148,11 +120,7 @@
                     "line": 1,
                     "column": 39
                   }
-                },
-                "range": [
-                  33,
-                  39
-                ]
+                }
               }
             }
           }
@@ -171,13 +139,10 @@
               "column": 42
             }
           },
-          "range": [
-            40,
-            42
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/50/expected.json b/test/fixtures/flow/type-annotations/50/expected.json
index 9b3fd7ae85..a30fc23bd0 100644
--- a/test/fixtures/flow/type-annotations/50/expected.json
+++ b/test/fixtures/flow/type-annotations/50/expected.json
@@ -12,10 +12,6 @@
       "column": 46
     }
   },
-  "range": [
-    0,
-    46
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 46
       }
     },
-    "range": [
-      0,
-      46
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 46
           }
         },
-        "range": [
-          0,
-          46
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 9
             }
           },
-          "range": [
-            6,
-            9
-          ],
           "name": "Foo"
         },
         "typeParameters": {
@@ -88,10 +72,6 @@
               "column": 12
             }
           },
-          "range": [
-            9,
-            12
-          ],
           "params": [
             {
               "type": "Identifier",
@@ -107,10 +87,6 @@
                   "column": 11
                 }
               },
-              "range": [
-                10,
-                11
-              ],
               "name": "T"
             }
           ]
@@ -130,10 +106,6 @@
               "column": 46
             }
           },
-          "range": [
-            13,
-            46
-          ],
           "body": [
             {
               "type": "MethodDefinition",
@@ -149,10 +121,6 @@
                   "column": 45
                 }
               },
-              "range": [
-                15,
-                45
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -168,10 +136,6 @@
                     "column": 18
                   }
                 },
-                "range": [
-                  15,
-                  18
-                ],
                 "name": "bar"
               },
               "static": false,
@@ -190,10 +154,6 @@
                     "column": 45
                   }
                 },
-                "range": [
-                  21,
-                  45
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -213,10 +173,6 @@
                       "column": 30
                     }
                   },
-                  "range": [
-                    23,
-                    30
-                  ],
                   "typeAnnotation": {
                     "type": "NumberTypeAnnotation",
                     "start": 24,
@@ -230,11 +186,7 @@
                         "line": 1,
                         "column": 30
                       }
-                    },
-                    "range": [
-                      24,
-                      30
-                    ]
+                    }
                   }
                 },
                 "body": {
@@ -251,10 +203,6 @@
                       "column": 45
                     }
                   },
-                  "range": [
-                    31,
-                    45
-                  ],
                   "body": [
                     {
                       "type": "ReturnStatement",
@@ -270,10 +218,6 @@
                           "column": 43
                         }
                       },
-                      "range": [
-                        33,
-                        43
-                      ],
                       "argument": {
                         "type": "Literal",
                         "start": 40,
@@ -288,10 +232,6 @@
                             "column": 42
                           }
                         },
-                        "range": [
-                          40,
-                          42
-                        ],
                         "value": 42,
                         "rawValue": 42,
                         "raw": "42"
@@ -313,10 +253,6 @@
                       "column": 21
                     }
                   },
-                  "range": [
-                    18,
-                    21
-                  ],
                   "params": [
                     {
                       "type": "Identifier",
@@ -332,10 +268,6 @@
                           "column": 20
                         }
                       },
-                      "range": [
-                        19,
-                        20
-                      ],
                       "name": "U"
                     }
                   ]
@@ -346,5 +278,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/51/expected.json b/test/fixtures/flow/type-annotations/51/expected.json
index 6ca5e497b4..efaa54f891 100644
--- a/test/fixtures/flow/type-annotations/51/expected.json
+++ b/test/fixtures/flow/type-annotations/51/expected.json
@@ -12,10 +12,6 @@
       "column": 28
     }
   },
-  "range": [
-    0,
-    28
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 28
       }
     },
-    "range": [
-      0,
-      28
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 28
           }
         },
-        "range": [
-          0,
-          28
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 9
             }
           },
-          "range": [
-            6,
-            9
-          ],
           "name": "Foo"
         },
         "superClass": null,
@@ -89,10 +73,6 @@
               "column": 28
             }
           },
-          "range": [
-            10,
-            28
-          ],
           "body": [
             {
               "type": "MethodDefinition",
@@ -108,10 +88,6 @@
                   "column": 26
                 }
               },
-              "range": [
-                12,
-                26
-              ],
               "computed": false,
               "key": {
                 "type": "Literal",
@@ -127,10 +103,6 @@
                     "column": 17
                   }
                 },
-                "range": [
-                  12,
-                  17
-                ],
                 "value": "bar",
                 "rawValue": "bar",
                 "raw": "\"bar\""
@@ -151,10 +123,6 @@
                     "column": 26
                   }
                 },
-                "range": [
-                  20,
-                  26
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -174,10 +142,6 @@
                       "column": 26
                     }
                   },
-                  "range": [
-                    23,
-                    26
-                  ],
                   "body": []
                 },
                 "typeParameters": {
@@ -194,10 +158,6 @@
                       "column": 20
                     }
                   },
-                  "range": [
-                    17,
-                    20
-                  ],
                   "params": [
                     {
                       "type": "Identifier",
@@ -213,10 +173,6 @@
                           "column": 19
                         }
                       },
-                      "range": [
-                        18,
-                        19
-                      ],
                       "name": "T"
                     }
                   ]
@@ -227,5 +183,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/52/expected.json b/test/fixtures/flow/type-annotations/52/expected.json
index c24c6aa556..5f58317a00 100644
--- a/test/fixtures/flow/type-annotations/52/expected.json
+++ b/test/fixtures/flow/type-annotations/52/expected.json
@@ -12,10 +12,6 @@
       "column": 41
     }
   },
-  "range": [
-    0,
-    41
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 41
       }
     },
-    "range": [
-      0,
-      41
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 41
           }
         },
-        "range": [
-          0,
-          41
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            9,
-            12
-          ],
           "name": "foo"
         },
         "generator": false,
@@ -92,10 +76,6 @@
                 "column": 26
               }
             },
-            "range": [
-              13,
-              26
-            ],
             "name": "requiredParam"
           },
           {
@@ -112,10 +92,6 @@
                 "column": 37
               }
             },
-            "range": [
-              28,
-              37
-            ],
             "name": "optParam",
             "optional": true
           }
@@ -134,13 +110,10 @@
               "column": 41
             }
           },
-          "range": [
-            39,
-            41
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/53/expected.json b/test/fixtures/flow/type-annotations/53/expected.json
index 10e10ec8dc..92988c85ef 100644
--- a/test/fixtures/flow/type-annotations/53/expected.json
+++ b/test/fixtures/flow/type-annotations/53/expected.json
@@ -12,10 +12,6 @@
       "column": 41
     }
   },
-  "range": [
-    0,
-    41
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 41
       }
     },
-    "range": [
-      0,
-      41
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 41
           }
         },
-        "range": [
-          0,
-          41
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 9
             }
           },
-          "range": [
-            6,
-            9
-          ],
           "name": "Foo"
         },
         "superClass": null,
@@ -89,10 +73,6 @@
               "column": 41
             }
           },
-          "range": [
-            10,
-            41
-          ],
           "body": [
             {
               "type": "ClassProperty",
@@ -108,10 +88,6 @@
                   "column": 25
                 }
               },
-              "range": [
-                12,
-                25
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -127,10 +103,6 @@
                     "column": 17
                   }
                 },
-                "range": [
-                  12,
-                  17
-                ],
                 "name": "prop1"
               },
               "static": false,
@@ -148,10 +120,6 @@
                     "column": 24
                   }
                 },
-                "range": [
-                  17,
-                  24
-                ],
                 "typeAnnotation": {
                   "type": "StringTypeAnnotation",
                   "start": 18,
@@ -165,11 +133,7 @@
                       "line": 1,
                       "column": 24
                     }
-                  },
-                  "range": [
-                    18,
-                    24
-                  ]
+                  }
                 }
               },
               "value": null
@@ -188,10 +152,6 @@
                   "column": 39
                 }
               },
-              "range": [
-                26,
-                39
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -207,10 +167,6 @@
                     "column": 31
                   }
                 },
-                "range": [
-                  26,
-                  31
-                ],
                 "name": "prop2"
               },
               "static": false,
@@ -228,10 +184,6 @@
                     "column": 38
                   }
                 },
-                "range": [
-                  31,
-                  38
-                ],
                 "typeAnnotation": {
                   "type": "NumberTypeAnnotation",
                   "start": 32,
@@ -245,11 +197,7 @@
                       "line": 1,
                       "column": 38
                     }
-                  },
-                  "range": [
-                    32,
-                    38
-                  ]
+                  }
                 }
               },
               "value": null
@@ -258,5 +206,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/54/expected.json b/test/fixtures/flow/type-annotations/54/expected.json
index 487ebc6e3a..02529f9695 100644
--- a/test/fixtures/flow/type-annotations/54/expected.json
+++ b/test/fixtures/flow/type-annotations/54/expected.json
@@ -12,10 +12,6 @@
       "column": 48
     }
   },
-  "range": [
-    0,
-    48
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 48
       }
     },
-    "range": [
-      0,
-      48
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 48
           }
         },
-        "range": [
-          0,
-          48
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 9
             }
           },
-          "range": [
-            6,
-            9
-          ],
           "name": "Foo"
         },
         "superClass": null,
@@ -89,10 +73,6 @@
               "column": 48
             }
           },
-          "range": [
-            10,
-            48
-          ],
           "body": [
             {
               "type": "ClassProperty",
@@ -108,10 +88,6 @@
                   "column": 32
                 }
               },
-              "range": [
-                12,
-                32
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -127,10 +103,6 @@
                     "column": 24
                   }
                 },
-                "range": [
-                  19,
-                  24
-                ],
                 "name": "prop1"
               },
               "static": true,
@@ -148,10 +120,6 @@
                     "column": 31
                   }
                 },
-                "range": [
-                  24,
-                  31
-                ],
                 "typeAnnotation": {
                   "type": "StringTypeAnnotation",
                   "start": 25,
@@ -165,11 +133,7 @@
                       "line": 1,
                       "column": 31
                     }
-                  },
-                  "range": [
-                    25,
-                    31
-                  ]
+                  }
                 }
               },
               "value": null
@@ -188,10 +152,6 @@
                   "column": 46
                 }
               },
-              "range": [
-                33,
-                46
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -207,10 +167,6 @@
                     "column": 38
                   }
                 },
-                "range": [
-                  33,
-                  38
-                ],
                 "name": "prop2"
               },
               "static": false,
@@ -228,10 +184,6 @@
                     "column": 45
                   }
                 },
-                "range": [
-                  38,
-                  45
-                ],
                 "typeAnnotation": {
                   "type": "NumberTypeAnnotation",
                   "start": 39,
@@ -245,11 +197,7 @@
                       "line": 1,
                       "column": 45
                     }
-                  },
-                  "range": [
-                    39,
-                    45
-                  ]
+                  }
                 }
               },
               "value": null
@@ -258,5 +206,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/55/expected.json b/test/fixtures/flow/type-annotations/55/expected.json
index 5bde7c6c61..ba55a107da 100644
--- a/test/fixtures/flow/type-annotations/55/expected.json
+++ b/test/fixtures/flow/type-annotations/55/expected.json
@@ -12,10 +12,6 @@
       "column": 28
     }
   },
-  "range": [
-    0,
-    28
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 28
       }
     },
-    "range": [
-      0,
-      28
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 28
           }
         },
-        "range": [
-          0,
-          28
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 27
               }
             },
-            "range": [
-              4,
-              27
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 23
                 }
               },
-              "range": [
-                4,
-                23
-              ],
               "name": "x",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 23
                   }
                 },
-                "range": [
-                  6,
-                  23
-                ],
                 "typeAnnotation": {
                   "type": "UnionTypeAnnotation",
                   "start": 8,
@@ -124,10 +100,6 @@
                       "column": 23
                     }
                   },
-                  "range": [
-                    8,
-                    23
-                  ],
                   "types": [
                     {
                       "type": "NumberTypeAnnotation",
@@ -142,11 +114,7 @@
                           "line": 1,
                           "column": 14
                         }
-                      },
-                      "range": [
-                        8,
-                        14
-                      ]
+                      }
                     },
                     {
                       "type": "StringTypeAnnotation",
@@ -161,11 +129,7 @@
                           "line": 1,
                           "column": 23
                         }
-                      },
-                      "range": [
-                        17,
-                        23
-                      ]
+                      }
                     }
                   ]
                 }
@@ -185,10 +149,6 @@
                   "column": 27
                 }
               },
-              "range": [
-                26,
-                27
-              ],
               "value": 4,
               "rawValue": 4,
               "raw": "4"
@@ -198,5 +158,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/56/expected.json b/test/fixtures/flow/type-annotations/56/expected.json
index eb2a0581e7..cb00fe285f 100644
--- a/test/fixtures/flow/type-annotations/56/expected.json
+++ b/test/fixtures/flow/type-annotations/56/expected.json
@@ -12,10 +12,6 @@
       "column": 49
     }
   },
-  "range": [
-    0,
-    49
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 49
       }
     },
-    "range": [
-      0,
-      49
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 49
           }
         },
-        "range": [
-          0,
-          49
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 11
             }
           },
-          "range": [
-            6,
-            11
-          ],
           "name": "Array"
         },
         "superClass": null,
@@ -89,10 +73,6 @@
               "column": 49
             }
           },
-          "range": [
-            12,
-            49
-          ],
           "body": [
             {
               "type": "MethodDefinition",
@@ -108,10 +88,6 @@
                   "column": 46
                 }
               },
-              "range": [
-                14,
-                46
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -127,10 +103,6 @@
                     "column": 20
                   }
                 },
-                "range": [
-                  14,
-                  20
-                ],
                 "name": "concat"
               },
               "static": false,
@@ -149,10 +121,6 @@
                     "column": 46
                   }
                 },
-                "range": [
-                  20,
-                  46
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -172,10 +140,6 @@
                         "column": 42
                       }
                     },
-                    "range": [
-                      21,
-                      42
-                    ],
                     "name": "items",
                     "typeAnnotation": {
                       "type": "TypeAnnotation",
@@ -191,10 +155,6 @@
                           "column": 42
                         }
                       },
-                      "range": [
-                        26,
-                        42
-                      ],
                       "typeAnnotation": {
                         "type": "UnionTypeAnnotation",
                         "start": 27,
@@ -209,10 +169,6 @@
                             "column": 42
                           }
                         },
-                        "range": [
-                          27,
-                          42
-                        ],
                         "types": [
                           {
                             "type": "NumberTypeAnnotation",
@@ -227,11 +183,7 @@
                                 "line": 1,
                                 "column": 33
                               }
-                            },
-                            "range": [
-                              27,
-                              33
-                            ]
+                            }
                           },
                           {
                             "type": "StringTypeAnnotation",
@@ -246,11 +198,7 @@
                                 "line": 1,
                                 "column": 42
                               }
-                            },
-                            "range": [
-                              36,
-                              42
-                            ]
+                            }
                           }
                         ]
                       }
@@ -271,10 +219,6 @@
                       "column": 46
                     }
                   },
-                  "range": [
-                    44,
-                    46
-                  ],
                   "body": []
                 }
               }
@@ -283,5 +227,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/57/expected.json b/test/fixtures/flow/type-annotations/57/expected.json
index 3904b06a9e..b151b8b6f8 100644
--- a/test/fixtures/flow/type-annotations/57/expected.json
+++ b/test/fixtures/flow/type-annotations/57/expected.json
@@ -12,10 +12,6 @@
       "column": 41
     }
   },
-  "range": [
-    0,
-    41
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 41
       }
     },
-    "range": [
-      0,
-      41
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 41
           }
         },
-        "range": [
-          0,
-          41
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 40
               }
             },
-            "range": [
-              4,
-              40
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 35
                 }
               },
-              "range": [
-                4,
-                35
-              ],
               "name": "x",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 35
                   }
                 },
-                "range": [
-                  6,
-                  35
-                ],
                 "typeAnnotation": {
                   "type": "FunctionTypeAnnotation",
                   "start": 8,
@@ -124,10 +100,6 @@
                       "column": 35
                     }
                   },
-                  "range": [
-                    8,
-                    35
-                  ],
                   "params": [],
                   "rest": null,
                   "returnType": {
@@ -144,10 +116,6 @@
                         "column": 35
                       }
                     },
-                    "range": [
-                      14,
-                      35
-                    ],
                     "types": [
                       {
                         "type": "NumberTypeAnnotation",
@@ -162,11 +130,7 @@
                             "line": 1,
                             "column": 20
                           }
-                        },
-                        "range": [
-                          14,
-                          20
-                        ]
+                        }
                       },
                       {
                         "type": "FunctionTypeAnnotation",
@@ -182,10 +146,6 @@
                             "column": 35
                           }
                         },
-                        "range": [
-                          23,
-                          35
-                        ],
                         "params": [],
                         "rest": null,
                         "returnType": {
@@ -201,11 +161,7 @@
                               "line": 1,
                               "column": 35
                             }
-                          },
-                          "range": [
-                            29,
-                            35
-                          ]
+                          }
                         },
                         "typeParameters": null
                       }
@@ -229,10 +185,6 @@
                   "column": 40
                 }
               },
-              "range": [
-                38,
-                40
-              ],
               "name": "fn"
             }
           }
@@ -240,5 +192,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/58/expected.json b/test/fixtures/flow/type-annotations/58/expected.json
index ded3488526..ffcb523252 100644
--- a/test/fixtures/flow/type-annotations/58/expected.json
+++ b/test/fixtures/flow/type-annotations/58/expected.json
@@ -12,10 +12,6 @@
       "column": 20
     }
   },
-  "range": [
-    0,
-    20
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 20
       }
     },
-    "range": [
-      0,
-      20
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 20
           }
         },
-        "range": [
-          0,
-          20
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 19
               }
             },
-            "range": [
-              4,
-              19
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 15
                 }
               },
-              "range": [
-                4,
-                15
-              ],
               "name": "x",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 15
                   }
                 },
-                "range": [
-                  5,
-                  15
-                ],
                 "typeAnnotation": {
                   "type": "TypeofTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 15
                     }
                   },
-                  "range": [
-                    7,
-                    15
-                  ],
                   "argument": {
                     "type": "GenericTypeAnnotation",
                     "start": 14,
@@ -142,10 +114,6 @@
                         "column": 15
                       }
                     },
-                    "range": [
-                      14,
-                      15
-                    ],
                     "typeParameters": null,
                     "id": {
                       "type": "Identifier",
@@ -161,10 +129,6 @@
                           "column": 15
                         }
                       },
-                      "range": [
-                        14,
-                        15
-                      ],
                       "name": "Y"
                     }
                   }
@@ -185,10 +149,6 @@
                   "column": 19
                 }
               },
-              "range": [
-                18,
-                19
-              ],
               "name": "Y"
             }
           }
@@ -196,5 +156,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/59/expected.json b/test/fixtures/flow/type-annotations/59/expected.json
index 6055cc7b7c..d512092524 100644
--- a/test/fixtures/flow/type-annotations/59/expected.json
+++ b/test/fixtures/flow/type-annotations/59/expected.json
@@ -12,10 +12,6 @@
       "column": 29
     }
   },
-  "range": [
-    0,
-    29
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 29
       }
     },
-    "range": [
-      0,
-      29
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 29
           }
         },
-        "range": [
-          0,
-          29
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 28
               }
             },
-            "range": [
-              4,
-              28
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 24
                 }
               },
-              "range": [
-                4,
-                24
-              ],
               "name": "x",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 24
                   }
                 },
-                "range": [
-                  5,
-                  24
-                ],
                 "typeAnnotation": {
                   "type": "UnionTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 24
                     }
                   },
-                  "range": [
-                    7,
-                    24
-                  ],
                   "types": [
                     {
                       "type": "TypeofTypeAnnotation",
@@ -143,10 +115,6 @@
                           "column": 15
                         }
                       },
-                      "range": [
-                        7,
-                        15
-                      ],
                       "argument": {
                         "type": "GenericTypeAnnotation",
                         "start": 14,
@@ -161,10 +129,6 @@
                             "column": 15
                           }
                         },
-                        "range": [
-                          14,
-                          15
-                        ],
                         "typeParameters": null,
                         "id": {
                           "type": "Identifier",
@@ -180,10 +144,6 @@
                               "column": 15
                             }
                           },
-                          "range": [
-                            14,
-                            15
-                          ],
                           "name": "Y"
                         }
                       }
@@ -201,11 +161,7 @@
                           "line": 1,
                           "column": 24
                         }
-                      },
-                      "range": [
-                        18,
-                        24
-                      ]
+                      }
                     }
                   ]
                 }
@@ -225,10 +181,6 @@
                   "column": 28
                 }
               },
-              "range": [
-                27,
-                28
-              ],
               "name": "Y"
             }
           }
@@ -236,5 +188,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/6/expected.json b/test/fixtures/flow/type-annotations/6/expected.json
index c20a9dcae3..d4ddc1ff2d 100644
--- a/test/fixtures/flow/type-annotations/6/expected.json
+++ b/test/fixtures/flow/type-annotations/6/expected.json
@@ -12,10 +12,6 @@
       "column": 36
     }
   },
-  "range": [
-    0,
-    36
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 36
       }
     },
-    "range": [
-      0,
-      36
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 36
           }
         },
-        "range": [
-          0,
-          36
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            9,
-            12
-          ],
           "name": "foo"
         },
         "generator": false,
@@ -92,10 +76,6 @@
                 "column": 33
               }
             },
-            "range": [
-              13,
-              33
-            ],
             "name": "nullableNum",
             "typeAnnotation": {
               "type": "TypeAnnotation",
@@ -111,10 +91,6 @@
                   "column": 33
                 }
               },
-              "range": [
-                24,
-                33
-              ],
               "typeAnnotation": {
                 "type": "NullableTypeAnnotation",
                 "start": 26,
@@ -129,10 +105,6 @@
                     "column": 33
                   }
                 },
-                "range": [
-                  26,
-                  33
-                ],
                 "typeAnnotation": {
                   "type": "NumberTypeAnnotation",
                   "start": 27,
@@ -146,11 +118,7 @@
                       "line": 1,
                       "column": 33
                     }
-                  },
-                  "range": [
-                    27,
-                    33
-                  ]
+                  }
                 }
               }
             }
@@ -170,13 +138,10 @@
               "column": 36
             }
           },
-          "range": [
-            34,
-            36
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/60/expected.json b/test/fixtures/flow/type-annotations/60/expected.json
index 5a92728d0d..4a4f09bb41 100644
--- a/test/fixtures/flow/type-annotations/60/expected.json
+++ b/test/fixtures/flow/type-annotations/60/expected.json
@@ -12,10 +12,6 @@
       "column": 40
     }
   },
-  "range": [
-    0,
-    40
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 40
       }
     },
-    "range": [
-      0,
-      40
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 40
           }
         },
-        "range": [
-          0,
-          40
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 39
               }
             },
-            "range": [
-              4,
-              39
-            ],
             "id": {
               "type": "ObjectPattern",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 22
                 }
               },
-              "range": [
-                4,
-                22
-              ],
               "properties": [
                 {
                   "type": "Property",
@@ -106,10 +86,6 @@
                       "column": 6
                     }
                   },
-                  "range": [
-                    5,
-                    6
-                  ],
                   "method": false,
                   "shorthand": true,
                   "computed": false,
@@ -127,10 +103,6 @@
                         "column": 6
                       }
                     },
-                    "range": [
-                      5,
-                      6
-                    ],
                     "name": "x"
                   },
                   "kind": "init",
@@ -148,10 +120,6 @@
                         "column": 6
                       }
                     },
-                    "range": [
-                      5,
-                      6
-                    ],
                     "name": "x"
                   }
                 }
@@ -170,10 +138,6 @@
                     "column": 22
                   }
                 },
-                "range": [
-                  7,
-                  22
-                ],
                 "typeAnnotation": {
                   "type": "ObjectTypeAnnotation",
                   "start": 9,
@@ -188,10 +152,6 @@
                       "column": 22
                     }
                   },
-                  "range": [
-                    9,
-                    22
-                  ],
                   "callProperties": [],
                   "properties": [
                     {
@@ -208,10 +168,6 @@
                           "column": 20
                         }
                       },
-                      "range": [
-                        10,
-                        20
-                      ],
                       "key": {
                         "type": "Identifier",
                         "start": 10,
@@ -226,10 +182,6 @@
                             "column": 11
                           }
                         },
-                        "range": [
-                          10,
-                          11
-                        ],
                         "name": "x"
                       },
                       "value": {
@@ -245,11 +197,7 @@
                             "line": 1,
                             "column": 19
                           }
-                        },
-                        "range": [
-                          13,
-                          19
-                        ]
+                        }
                       },
                       "optional": false
                     }
@@ -272,10 +220,6 @@
                   "column": 39
                 }
               },
-              "range": [
-                25,
-                39
-              ],
               "properties": [
                 {
                   "type": "Property",
@@ -291,10 +235,6 @@
                       "column": 37
                     }
                   },
-                  "range": [
-                    27,
-                    37
-                  ],
                   "method": false,
                   "shorthand": false,
                   "computed": false,
@@ -312,10 +252,6 @@
                         "column": 28
                       }
                     },
-                    "range": [
-                      27,
-                      28
-                    ],
                     "name": "x"
                   },
                   "value": {
@@ -332,10 +268,6 @@
                         "column": 37
                       }
                     },
-                    "range": [
-                      30,
-                      37
-                    ],
                     "value": "hello",
                     "rawValue": "hello",
                     "raw": "\"hello\""
@@ -349,5 +281,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/61/expected.json b/test/fixtures/flow/type-annotations/61/expected.json
index 85fe9a4800..da30aa7d42 100644
--- a/test/fixtures/flow/type-annotations/61/expected.json
+++ b/test/fixtures/flow/type-annotations/61/expected.json
@@ -12,10 +12,6 @@
       "column": 39
     }
   },
-  "range": [
-    0,
-    39
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 39
       }
     },
-    "range": [
-      0,
-      39
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 39
           }
         },
-        "range": [
-          0,
-          39
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 38
               }
             },
-            "range": [
-              4,
-              38
-            ],
             "id": {
               "type": "ObjectPattern",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 21
                 }
               },
-              "range": [
-                4,
-                21
-              ],
               "properties": [
                 {
                   "type": "Property",
@@ -106,10 +86,6 @@
                       "column": 6
                     }
                   },
-                  "range": [
-                    5,
-                    6
-                  ],
                   "method": false,
                   "shorthand": true,
                   "computed": false,
@@ -127,10 +103,6 @@
                         "column": 6
                       }
                     },
-                    "range": [
-                      5,
-                      6
-                    ],
                     "name": "x"
                   },
                   "kind": "init",
@@ -148,10 +120,6 @@
                         "column": 6
                       }
                     },
-                    "range": [
-                      5,
-                      6
-                    ],
                     "name": "x"
                   }
                 }
@@ -170,10 +138,6 @@
                     "column": 21
                   }
                 },
-                "range": [
-                  7,
-                  21
-                ],
                 "typeAnnotation": {
                   "type": "ObjectTypeAnnotation",
                   "start": 9,
@@ -188,10 +152,6 @@
                       "column": 21
                     }
                   },
-                  "range": [
-                    9,
-                    21
-                  ],
                   "callProperties": [],
                   "properties": [
                     {
@@ -208,10 +168,6 @@
                           "column": 19
                         }
                       },
-                      "range": [
-                        10,
-                        19
-                      ],
                       "key": {
                         "type": "Identifier",
                         "start": 10,
@@ -226,10 +182,6 @@
                             "column": 11
                           }
                         },
-                        "range": [
-                          10,
-                          11
-                        ],
                         "name": "x"
                       },
                       "value": {
@@ -245,11 +197,7 @@
                             "line": 1,
                             "column": 19
                           }
-                        },
-                        "range": [
-                          13,
-                          19
-                        ]
+                        }
                       },
                       "optional": false
                     }
@@ -272,10 +220,6 @@
                   "column": 38
                 }
               },
-              "range": [
-                24,
-                38
-              ],
               "properties": [
                 {
                   "type": "Property",
@@ -291,10 +235,6 @@
                       "column": 36
                     }
                   },
-                  "range": [
-                    26,
-                    36
-                  ],
                   "method": false,
                   "shorthand": false,
                   "computed": false,
@@ -312,10 +252,6 @@
                         "column": 27
                       }
                     },
-                    "range": [
-                      26,
-                      27
-                    ],
                     "name": "x"
                   },
                   "value": {
@@ -332,10 +268,6 @@
                         "column": 36
                       }
                     },
-                    "range": [
-                      29,
-                      36
-                    ],
                     "value": "hello",
                     "rawValue": "hello",
                     "raw": "\"hello\""
@@ -349,5 +281,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/62/expected.json b/test/fixtures/flow/type-annotations/62/expected.json
index 9c58a7f624..bb2b505c32 100644
--- a/test/fixtures/flow/type-annotations/62/expected.json
+++ b/test/fixtures/flow/type-annotations/62/expected.json
@@ -12,10 +12,6 @@
       "column": 37
     }
   },
-  "range": [
-    0,
-    37
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 37
       }
     },
-    "range": [
-      0,
-      37
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 37
           }
         },
-        "range": [
-          0,
-          37
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 36
               }
             },
-            "range": [
-              4,
-              36
-            ],
             "id": {
               "type": "ArrayPattern",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 22
                 }
               },
-              "range": [
-                4,
-                22
-              ],
               "elements": [
                 {
                   "type": "Identifier",
@@ -106,10 +86,6 @@
                       "column": 6
                     }
                   },
-                  "range": [
-                    5,
-                    6
-                  ],
                   "name": "x"
                 }
               ],
@@ -127,10 +103,6 @@
                     "column": 22
                   }
                 },
-                "range": [
-                  7,
-                  22
-                ],
                 "typeAnnotation": {
                   "type": "GenericTypeAnnotation",
                   "start": 9,
@@ -145,10 +117,6 @@
                       "column": 22
                     }
                   },
-                  "range": [
-                    9,
-                    22
-                  ],
                   "typeParameters": {
                     "type": "TypeParameterInstantiation",
                     "start": 14,
@@ -163,10 +131,6 @@
                         "column": 22
                       }
                     },
-                    "range": [
-                      14,
-                      22
-                    ],
                     "params": [
                       {
                         "type": "StringTypeAnnotation",
@@ -181,11 +145,7 @@
                             "line": 1,
                             "column": 21
                           }
-                        },
-                        "range": [
-                          15,
-                          21
-                        ]
+                        }
                       }
                     ]
                   },
@@ -203,10 +163,6 @@
                         "column": 14
                       }
                     },
-                    "range": [
-                      9,
-                      14
-                    ],
                     "name": "Array"
                   }
                 }
@@ -226,10 +182,6 @@
                   "column": 36
                 }
               },
-              "range": [
-                25,
-                36
-              ],
               "elements": [
                 {
                   "type": "Literal",
@@ -245,10 +197,6 @@
                       "column": 34
                     }
                   },
-                  "range": [
-                    27,
-                    34
-                  ],
                   "value": "hello",
                   "rawValue": "hello",
                   "raw": "\"hello\""
@@ -260,5 +208,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/63/expected.json b/test/fixtures/flow/type-annotations/63/expected.json
index 4511e4e0aa..d6686b4b73 100644
--- a/test/fixtures/flow/type-annotations/63/expected.json
+++ b/test/fixtures/flow/type-annotations/63/expected.json
@@ -12,10 +12,6 @@
       "column": 36
     }
   },
-  "range": [
-    0,
-    36
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 36
       }
     },
-    "range": [
-      0,
-      36
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 36
           }
         },
-        "range": [
-          0,
-          36
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            9,
-            12
-          ],
           "name": "foo"
         },
         "generator": false,
@@ -92,10 +76,6 @@
                 "column": 32
               }
             },
-            "range": [
-              13,
-              32
-            ],
             "properties": [
               {
                 "type": "Property",
@@ -111,10 +91,6 @@
                     "column": 15
                   }
                 },
-                "range": [
-                  14,
-                  15
-                ],
                 "method": false,
                 "shorthand": true,
                 "computed": false,
@@ -132,10 +108,6 @@
                       "column": 15
                     }
                   },
-                  "range": [
-                    14,
-                    15
-                  ],
                   "name": "x"
                 },
                 "kind": "init",
@@ -153,10 +125,6 @@
                       "column": 15
                     }
                   },
-                  "range": [
-                    14,
-                    15
-                  ],
                   "name": "x"
                 }
               }
@@ -175,10 +143,6 @@
                   "column": 32
                 }
               },
-              "range": [
-                16,
-                32
-              ],
               "typeAnnotation": {
                 "type": "ObjectTypeAnnotation",
                 "start": 18,
@@ -193,10 +157,6 @@
                     "column": 32
                   }
                 },
-                "range": [
-                  18,
-                  32
-                ],
                 "callProperties": [],
                 "properties": [
                   {
@@ -213,10 +173,6 @@
                         "column": 30
                       }
                     },
-                    "range": [
-                      20,
-                      30
-                    ],
                     "key": {
                       "type": "Identifier",
                       "start": 20,
@@ -231,10 +187,6 @@
                           "column": 21
                         }
                       },
-                      "range": [
-                        20,
-                        21
-                      ],
                       "name": "x"
                     },
                     "value": {
@@ -250,11 +202,7 @@
                           "line": 1,
                           "column": 29
                         }
-                      },
-                      "range": [
-                        23,
-                        29
-                      ]
+                      }
                     },
                     "optional": false
                   }
@@ -278,13 +226,10 @@
               "column": 36
             }
           },
-          "range": [
-            34,
-            36
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/64/expected.json b/test/fixtures/flow/type-annotations/64/expected.json
index 27ea1417d2..ff6128153f 100644
--- a/test/fixtures/flow/type-annotations/64/expected.json
+++ b/test/fixtures/flow/type-annotations/64/expected.json
@@ -12,10 +12,6 @@
       "column": 35
     }
   },
-  "range": [
-    0,
-    35
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 35
       }
     },
-    "range": [
-      0,
-      35
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 35
           }
         },
-        "range": [
-          0,
-          35
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            9,
-            12
-          ],
           "name": "foo"
         },
         "generator": false,
@@ -92,10 +76,6 @@
                 "column": 31
               }
             },
-            "range": [
-              13,
-              31
-            ],
             "elements": [
               {
                 "type": "Identifier",
@@ -111,10 +91,6 @@
                     "column": 15
                   }
                 },
-                "range": [
-                  14,
-                  15
-                ],
                 "name": "x"
               }
             ],
@@ -132,10 +108,6 @@
                   "column": 31
                 }
               },
-              "range": [
-                16,
-                31
-              ],
               "typeAnnotation": {
                 "type": "GenericTypeAnnotation",
                 "start": 18,
@@ -150,10 +122,6 @@
                     "column": 31
                   }
                 },
-                "range": [
-                  18,
-                  31
-                ],
                 "typeParameters": {
                   "type": "TypeParameterInstantiation",
                   "start": 23,
@@ -168,10 +136,6 @@
                       "column": 31
                     }
                   },
-                  "range": [
-                    23,
-                    31
-                  ],
                   "params": [
                     {
                       "type": "StringTypeAnnotation",
@@ -186,11 +150,7 @@
                           "line": 1,
                           "column": 30
                         }
-                      },
-                      "range": [
-                        24,
-                        30
-                      ]
+                      }
                     }
                   ]
                 },
@@ -208,10 +168,6 @@
                       "column": 23
                     }
                   },
-                  "range": [
-                    18,
-                    23
-                  ],
                   "name": "Array"
                 }
               }
@@ -232,13 +188,10 @@
               "column": 35
             }
           },
-          "range": [
-            33,
-            35
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/65/expected.json b/test/fixtures/flow/type-annotations/65/expected.json
index 50f58d138d..d5077fb333 100644
--- a/test/fixtures/flow/type-annotations/65/expected.json
+++ b/test/fixtures/flow/type-annotations/65/expected.json
@@ -12,10 +12,6 @@
       "column": 39
     }
   },
-  "range": [
-    0,
-    39
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 39
       }
     },
-    "range": [
-      0,
-      39
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 39
           }
         },
-        "range": [
-          0,
-          39
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            9,
-            12
-          ],
           "name": "foo"
         },
         "generator": false,
@@ -92,10 +76,6 @@
                 "column": 35
               }
             },
-            "range": [
-              13,
-              35
-            ],
             "argument": {
               "type": "Identifier",
               "start": 16,
@@ -110,10 +90,6 @@
                   "column": 20
                 }
               },
-              "range": [
-                16,
-                20
-              ],
               "name": "rest"
             },
             "typeAnnotation": {
@@ -130,10 +106,6 @@
                   "column": 35
                 }
               },
-              "range": [
-                20,
-                35
-              ],
               "typeAnnotation": {
                 "type": "GenericTypeAnnotation",
                 "start": 22,
@@ -148,10 +120,6 @@
                     "column": 35
                   }
                 },
-                "range": [
-                  22,
-                  35
-                ],
                 "typeParameters": {
                   "type": "TypeParameterInstantiation",
                   "start": 27,
@@ -166,10 +134,6 @@
                       "column": 35
                     }
                   },
-                  "range": [
-                    27,
-                    35
-                  ],
                   "params": [
                     {
                       "type": "NumberTypeAnnotation",
@@ -184,11 +148,7 @@
                           "line": 1,
                           "column": 34
                         }
-                      },
-                      "range": [
-                        28,
-                        34
-                      ]
+                      }
                     }
                   ]
                 },
@@ -206,10 +166,6 @@
                       "column": 27
                     }
                   },
-                  "range": [
-                    22,
-                    27
-                  ],
                   "name": "Array"
                 }
               }
@@ -230,13 +186,10 @@
               "column": 39
             }
           },
-          "range": [
-            37,
-            39
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/66/expected.json b/test/fixtures/flow/type-annotations/66/expected.json
index ee5f6ebdcf..d684d49b74 100644
--- a/test/fixtures/flow/type-annotations/66/expected.json
+++ b/test/fixtures/flow/type-annotations/66/expected.json
@@ -12,10 +12,6 @@
       "column": 38
     }
   },
-  "range": [
-    0,
-    38
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 38
       }
     },
-    "range": [
-      0,
-      38
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 38
           }
         },
-        "range": [
-          0,
-          38
-        ],
         "expression": {
           "type": "FunctionExpression",
           "start": 1,
@@ -68,10 +56,6 @@
               "column": 37
             }
           },
-          "range": [
-            1,
-            37
-          ],
           "id": null,
           "generator": false,
           "expression": false,
@@ -91,10 +75,6 @@
                   "column": 33
                 }
               },
-              "range": [
-                11,
-                33
-              ],
               "argument": {
                 "type": "Identifier",
                 "start": 14,
@@ -109,10 +89,6 @@
                     "column": 18
                   }
                 },
-                "range": [
-                  14,
-                  18
-                ],
                 "name": "rest"
               },
               "typeAnnotation": {
@@ -129,10 +105,6 @@
                     "column": 33
                   }
                 },
-                "range": [
-                  18,
-                  33
-                ],
                 "typeAnnotation": {
                   "type": "GenericTypeAnnotation",
                   "start": 20,
@@ -147,10 +119,6 @@
                       "column": 33
                     }
                   },
-                  "range": [
-                    20,
-                    33
-                  ],
                   "typeParameters": {
                     "type": "TypeParameterInstantiation",
                     "start": 25,
@@ -165,10 +133,6 @@
                         "column": 33
                       }
                     },
-                    "range": [
-                      25,
-                      33
-                    ],
                     "params": [
                       {
                         "type": "NumberTypeAnnotation",
@@ -183,11 +147,7 @@
                             "line": 1,
                             "column": 32
                           }
-                        },
-                        "range": [
-                          26,
-                          32
-                        ]
+                        }
                       }
                     ]
                   },
@@ -205,10 +165,6 @@
                         "column": 25
                       }
                     },
-                    "range": [
-                      20,
-                      25
-                    ],
                     "name": "Array"
                   }
                 }
@@ -229,15 +185,12 @@
                 "column": 37
               }
             },
-            "range": [
-              35,
-              37
-            ],
             "body": []
           },
           "parenthesizedExpression": true
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/67/expected.json b/test/fixtures/flow/type-annotations/67/expected.json
index 96fccc36d5..a95af4382b 100644
--- a/test/fixtures/flow/type-annotations/67/expected.json
+++ b/test/fixtures/flow/type-annotations/67/expected.json
@@ -12,10 +12,6 @@
       "column": 28
     }
   },
-  "range": [
-    0,
-    28
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 28
       }
     },
-    "range": [
-      0,
-      28
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 28
           }
         },
-        "range": [
-          0,
-          28
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 27
               }
             },
-            "range": [
-              4,
-              27
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 7
                 }
               },
-              "range": [
-                4,
-                7
-              ],
               "name": "foo"
             },
             "init": {
@@ -107,10 +87,6 @@
                   "column": 27
                 }
               },
-              "range": [
-                10,
-                27
-              ],
               "returnType": {
                 "type": "TypeAnnotation",
                 "start": 12,
@@ -125,10 +101,6 @@
                     "column": 20
                   }
                 },
-                "range": [
-                  12,
-                  20
-                ],
                 "typeAnnotation": {
                   "type": "NumberTypeAnnotation",
                   "start": 14,
@@ -142,11 +114,7 @@
                       "line": 1,
                       "column": 20
                     }
-                  },
-                  "range": [
-                    14,
-                    20
-                  ]
+                  }
                 }
               },
               "id": null,
@@ -168,10 +136,6 @@
                     "column": 27
                   }
                 },
-                "range": [
-                  24,
-                  27
-                ],
                 "name": "bar"
               }
             }
@@ -180,5 +144,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/68/expected.json b/test/fixtures/flow/type-annotations/68/expected.json
index 54b242fd2f..7e864bb663 100644
--- a/test/fixtures/flow/type-annotations/68/expected.json
+++ b/test/fixtures/flow/type-annotations/68/expected.json
@@ -12,10 +12,6 @@
       "column": 31
     }
   },
-  "range": [
-    0,
-    31
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 31
       }
     },
-    "range": [
-      0,
-      31
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 31
           }
         },
-        "range": [
-          0,
-          31
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 30
               }
             },
-            "range": [
-              4,
-              30
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 7
                 }
               },
-              "range": [
-                4,
-                7
-              ],
               "name": "foo"
             },
             "init": {
@@ -107,10 +87,6 @@
                   "column": 30
                 }
               },
-              "range": [
-                10,
-                30
-              ],
               "id": null,
               "generator": false,
               "expression": true,
@@ -130,10 +106,6 @@
                       "column": 14
                     }
                   },
-                  "range": [
-                    11,
-                    14
-                  ],
                   "name": "bar",
                   "parenthesizedExpression": true
                 }
@@ -152,10 +124,6 @@
                     "column": 30
                   }
                 },
-                "range": [
-                  27,
-                  30
-                ],
                 "name": "bar"
               },
               "returnType": {
@@ -172,10 +140,6 @@
                     "column": 23
                   }
                 },
-                "range": [
-                  15,
-                  23
-                ],
                 "typeAnnotation": {
                   "type": "NumberTypeAnnotation",
                   "start": 17,
@@ -189,11 +153,7 @@
                       "line": 1,
                       "column": 23
                     }
-                  },
-                  "range": [
-                    17,
-                    23
-                  ]
+                  }
                 }
               }
             }
@@ -202,5 +162,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/69/expected.json b/test/fixtures/flow/type-annotations/69/expected.json
index 2c3bf20e14..b30dd3bfcb 100644
--- a/test/fixtures/flow/type-annotations/69/expected.json
+++ b/test/fixtures/flow/type-annotations/69/expected.json
@@ -12,10 +12,6 @@
       "column": 42
     }
   },
-  "range": [
-    0,
-    42
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 42
       }
     },
-    "range": [
-      0,
-      42
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 42
           }
         },
-        "range": [
-          0,
-          42
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 42
               }
             },
-            "range": [
-              4,
-              42
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 7
                 }
               },
-              "range": [
-                4,
-                7
-              ],
               "name": "foo"
             },
             "init": {
@@ -107,10 +87,6 @@
                   "column": 42
                 }
               },
-              "range": [
-                10,
-                42
-              ],
               "id": null,
               "generator": false,
               "expression": false,
@@ -130,10 +106,6 @@
                       "column": 20
                     }
                   },
-                  "range": [
-                    17,
-                    20
-                  ],
                   "name": "foo",
                   "typeAnnotation": {
                     "type": "TypeAnnotation",
@@ -149,10 +121,6 @@
                         "column": 25
                       }
                     },
-                    "range": [
-                      20,
-                      25
-                    ],
                     "typeAnnotation": {
                       "type": "GenericTypeAnnotation",
                       "start": 22,
@@ -167,10 +135,6 @@
                           "column": 25
                         }
                       },
-                      "range": [
-                        22,
-                        25
-                      ],
                       "typeParameters": null,
                       "id": {
                         "type": "Identifier",
@@ -186,10 +150,6 @@
                             "column": 25
                           }
                         },
-                        "range": [
-                          22,
-                          25
-                        ],
                         "name": "bar"
                       }
                     }
@@ -209,10 +169,6 @@
                       "column": 30
                     }
                   },
-                  "range": [
-                    27,
-                    30
-                  ],
                   "name": "bar",
                   "typeAnnotation": {
                     "type": "TypeAnnotation",
@@ -228,10 +184,6 @@
                         "column": 35
                       }
                     },
-                    "range": [
-                      30,
-                      35
-                    ],
                     "typeAnnotation": {
                       "type": "GenericTypeAnnotation",
                       "start": 32,
@@ -246,10 +198,6 @@
                           "column": 35
                         }
                       },
-                      "range": [
-                        32,
-                        35
-                      ],
                       "typeParameters": null,
                       "id": {
                         "type": "Identifier",
@@ -265,10 +213,6 @@
                             "column": 35
                           }
                         },
-                        "range": [
-                          32,
-                          35
-                        ],
                         "name": "foo"
                       }
                     }
@@ -289,10 +233,6 @@
                     "column": 42
                   }
                 },
-                "range": [
-                  40,
-                  42
-                ],
                 "body": []
               }
             }
@@ -301,5 +241,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/7/expected.json b/test/fixtures/flow/type-annotations/7/expected.json
index d4d77c2f60..3d3f13417e 100644
--- a/test/fixtures/flow/type-annotations/7/expected.json
+++ b/test/fixtures/flow/type-annotations/7/expected.json
@@ -12,10 +12,6 @@
       "column": 36
     }
   },
-  "range": [
-    0,
-    36
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 36
       }
     },
-    "range": [
-      0,
-      36
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 36
           }
         },
-        "range": [
-          0,
-          36
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            9,
-            12
-          ],
           "name": "foo"
         },
         "generator": false,
@@ -92,10 +76,6 @@
                 "column": 33
               }
             },
-            "range": [
-              13,
-              33
-            ],
             "name": "callback",
             "typeAnnotation": {
               "type": "TypeAnnotation",
@@ -111,10 +91,6 @@
                   "column": 33
                 }
               },
-              "range": [
-                21,
-                33
-              ],
               "typeAnnotation": {
                 "type": "FunctionTypeAnnotation",
                 "start": 23,
@@ -129,10 +105,6 @@
                     "column": 33
                   }
                 },
-                "range": [
-                  23,
-                  33
-                ],
                 "params": [],
                 "rest": null,
                 "returnType": {
@@ -148,11 +120,7 @@
                       "line": 1,
                       "column": 33
                     }
-                  },
-                  "range": [
-                    29,
-                    33
-                  ]
+                  }
                 },
                 "typeParameters": null
               }
@@ -173,13 +141,10 @@
               "column": 36
             }
           },
-          "range": [
-            34,
-            36
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/70/expected.json b/test/fixtures/flow/type-annotations/70/expected.json
index c25617e414..e878b39d1e 100644
--- a/test/fixtures/flow/type-annotations/70/expected.json
+++ b/test/fixtures/flow/type-annotations/70/expected.json
@@ -12,10 +12,6 @@
       "column": 34
     }
   },
-  "range": [
-    0,
-    34
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 34
       }
     },
-    "range": [
-      0,
-      34
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 34
           }
         },
-        "range": [
-          0,
-          34
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 33
               }
             },
-            "range": [
-              4,
-              33
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 7
                 }
               },
-              "range": [
-                4,
-                7
-              ],
               "name": "foo"
             },
             "init": {
@@ -107,10 +87,6 @@
                   "column": 33
                 }
               },
-              "range": [
-                10,
-                33
-              ],
               "returnType": {
                 "type": "TypeAnnotation",
                 "start": 18,
@@ -125,10 +101,6 @@
                     "column": 26
                   }
                 },
-                "range": [
-                  18,
-                  26
-                ],
                 "typeAnnotation": {
                   "type": "NumberTypeAnnotation",
                   "start": 20,
@@ -142,11 +114,7 @@
                       "line": 1,
                       "column": 26
                     }
-                  },
-                  "range": [
-                    20,
-                    26
-                  ]
+                  }
                 }
               },
               "id": null,
@@ -168,10 +136,6 @@
                     "column": 33
                   }
                 },
-                "range": [
-                  30,
-                  33
-                ],
                 "name": "bar"
               }
             }
@@ -180,5 +144,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/71/expected.json b/test/fixtures/flow/type-annotations/71/expected.json
index a2f8d7cc7c..052f293ead 100644
--- a/test/fixtures/flow/type-annotations/71/expected.json
+++ b/test/fixtures/flow/type-annotations/71/expected.json
@@ -12,10 +12,6 @@
       "column": 37
     }
   },
-  "range": [
-    0,
-    37
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 37
       }
     },
-    "range": [
-      0,
-      37
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 37
           }
         },
-        "range": [
-          0,
-          37
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 36
               }
             },
-            "range": [
-              4,
-              36
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 7
                 }
               },
-              "range": [
-                4,
-                7
-              ],
               "name": "foo"
             },
             "init": {
@@ -107,10 +87,6 @@
                   "column": 36
                 }
               },
-              "range": [
-                10,
-                36
-              ],
               "returnType": {
                 "type": "TypeAnnotation",
                 "start": 21,
@@ -125,10 +101,6 @@
                     "column": 29
                   }
                 },
-                "range": [
-                  21,
-                  29
-                ],
                 "typeAnnotation": {
                   "type": "NumberTypeAnnotation",
                   "start": 23,
@@ -142,11 +114,7 @@
                       "line": 1,
                       "column": 29
                     }
-                  },
-                  "range": [
-                    23,
-                    29
-                  ]
+                  }
                 }
               },
               "id": null,
@@ -168,10 +136,6 @@
                       "column": 20
                     }
                   },
-                  "range": [
-                    17,
-                    20
-                  ],
                   "name": "bar"
                 }
               ],
@@ -189,10 +153,6 @@
                     "column": 36
                   }
                 },
-                "range": [
-                  33,
-                  36
-                ],
                 "name": "bar"
               }
             }
@@ -201,5 +161,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/72/expected.json b/test/fixtures/flow/type-annotations/72/expected.json
index 2c8b31667c..bab73a4f10 100644
--- a/test/fixtures/flow/type-annotations/72/expected.json
+++ b/test/fixtures/flow/type-annotations/72/expected.json
@@ -12,10 +12,6 @@
       "column": 30
     }
   },
-  "range": [
-    0,
-    30
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 30
       }
     },
-    "range": [
-      0,
-      30
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 30
           }
         },
-        "range": [
-          0,
-          30
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 29
               }
             },
-            "range": [
-              4,
-              29
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 7
                 }
               },
-              "range": [
-                4,
-                7
-              ],
               "name": "foo"
             },
             "init": {
@@ -107,10 +87,6 @@
                   "column": 28
                 }
               },
-              "range": [
-                11,
-                28
-              ],
               "returnType": {
                 "type": "TypeAnnotation",
                 "start": 13,
@@ -125,10 +101,6 @@
                     "column": 21
                   }
                 },
-                "range": [
-                  13,
-                  21
-                ],
                 "typeAnnotation": {
                   "type": "NumberTypeAnnotation",
                   "start": 15,
@@ -142,11 +114,7 @@
                       "line": 1,
                       "column": 21
                     }
-                  },
-                  "range": [
-                    15,
-                    21
-                  ]
+                  }
                 }
               },
               "id": null,
@@ -168,10 +136,6 @@
                     "column": 28
                   }
                 },
-                "range": [
-                  25,
-                  28
-                ],
                 "name": "bar"
               },
               "parenthesizedExpression": true
@@ -181,5 +145,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/73/expected.json b/test/fixtures/flow/type-annotations/73/expected.json
index eb554e1ce4..09068edec7 100644
--- a/test/fixtures/flow/type-annotations/73/expected.json
+++ b/test/fixtures/flow/type-annotations/73/expected.json
@@ -12,10 +12,6 @@
       "column": 33
     }
   },
-  "range": [
-    0,
-    33
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 33
       }
     },
-    "range": [
-      0,
-      33
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 33
           }
         },
-        "range": [
-          0,
-          33
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 32
               }
             },
-            "range": [
-              4,
-              32
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 7
                 }
               },
-              "range": [
-                4,
-                7
-              ],
               "name": "foo"
             },
             "init": {
@@ -107,10 +87,6 @@
                   "column": 31
                 }
               },
-              "range": [
-                11,
-                31
-              ],
               "id": null,
               "generator": false,
               "expression": true,
@@ -130,10 +106,6 @@
                       "column": 15
                     }
                   },
-                  "range": [
-                    12,
-                    15
-                  ],
                   "name": "bar",
                   "parenthesizedExpression": true
                 }
@@ -152,10 +124,6 @@
                     "column": 31
                   }
                 },
-                "range": [
-                  28,
-                  31
-                ],
                 "name": "bar"
               },
               "returnType": {
@@ -172,10 +140,6 @@
                     "column": 24
                   }
                 },
-                "range": [
-                  16,
-                  24
-                ],
                 "typeAnnotation": {
                   "type": "NumberTypeAnnotation",
                   "start": 18,
@@ -189,11 +153,7 @@
                       "line": 1,
                       "column": 24
                     }
-                  },
-                  "range": [
-                    18,
-                    24
-                  ]
+                  }
                 }
               },
               "parenthesizedExpression": true
@@ -203,5 +163,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/74/expected.json b/test/fixtures/flow/type-annotations/74/expected.json
index d8018a734e..5583d9416d 100644
--- a/test/fixtures/flow/type-annotations/74/expected.json
+++ b/test/fixtures/flow/type-annotations/74/expected.json
@@ -12,10 +12,6 @@
       "column": 43
     }
   },
-  "range": [
-    0,
-    43
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 43
       }
     },
-    "range": [
-      0,
-      43
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 43
           }
         },
-        "range": [
-          0,
-          43
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 42
               }
             },
-            "range": [
-              4,
-              42
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 7
                 }
               },
-              "range": [
-                4,
-                7
-              ],
               "name": "foo"
             },
             "init": {
@@ -107,10 +87,6 @@
                   "column": 41
                 }
               },
-              "range": [
-                11,
-                41
-              ],
               "expression": {
                 "type": "ArrowFunctionExpression",
                 "start": 12,
@@ -125,10 +101,6 @@
                     "column": 32
                   }
                 },
-                "range": [
-                  12,
-                  32
-                ],
                 "id": null,
                 "generator": false,
                 "expression": true,
@@ -148,10 +120,6 @@
                         "column": 16
                       }
                     },
-                    "range": [
-                      13,
-                      16
-                    ],
                     "name": "bar",
                     "parenthesizedExpression": true
                   }
@@ -170,10 +138,6 @@
                       "column": 32
                     }
                   },
-                  "range": [
-                    29,
-                    32
-                  ],
                   "name": "bar"
                 },
                 "returnType": {
@@ -190,10 +154,6 @@
                       "column": 25
                     }
                   },
-                  "range": [
-                    17,
-                    25
-                  ],
                   "typeAnnotation": {
                     "type": "NumberTypeAnnotation",
                     "start": 19,
@@ -207,11 +167,7 @@
                         "line": 1,
                         "column": 25
                       }
-                    },
-                    "range": [
-                      19,
-                      25
-                    ]
+                    }
                   }
                 },
                 "parenthesizedExpression": true
@@ -230,10 +186,6 @@
                     "column": 41
                   }
                 },
-                "range": [
-                  33,
-                  41
-                ],
                 "typeAnnotation": {
                   "type": "NumberTypeAnnotation",
                   "start": 35,
@@ -247,11 +199,7 @@
                       "line": 1,
                       "column": 41
                     }
-                  },
-                  "range": [
-                    35,
-                    41
-                  ]
+                  }
                 }
               },
               "parenthesizedExpression": true
@@ -261,5 +209,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/75/expected.json b/test/fixtures/flow/type-annotations/75/expected.json
index ba70a16d69..7f9df81c66 100644
--- a/test/fixtures/flow/type-annotations/75/expected.json
+++ b/test/fixtures/flow/type-annotations/75/expected.json
@@ -12,10 +12,6 @@
       "column": 36
     }
   },
-  "range": [
-    0,
-    36
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 36
       }
     },
-    "range": [
-      0,
-      36
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 36
           }
         },
-        "range": [
-          0,
-          36
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 35
               }
             },
-            "range": [
-              4,
-              35
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 7
                 }
               },
-              "range": [
-                4,
-                7
-              ],
               "name": "foo"
             },
             "init": {
@@ -107,10 +87,6 @@
                   "column": 34
                 }
               },
-              "range": [
-                11,
-                34
-              ],
               "returnType": {
                 "type": "TypeAnnotation",
                 "start": 19,
@@ -125,10 +101,6 @@
                     "column": 27
                   }
                 },
-                "range": [
-                  19,
-                  27
-                ],
                 "typeAnnotation": {
                   "type": "NumberTypeAnnotation",
                   "start": 21,
@@ -142,11 +114,7 @@
                       "line": 1,
                       "column": 27
                     }
-                  },
-                  "range": [
-                    21,
-                    27
-                  ]
+                  }
                 }
               },
               "id": null,
@@ -168,10 +136,6 @@
                     "column": 34
                   }
                 },
-                "range": [
-                  31,
-                  34
-                ],
                 "name": "bar"
               },
               "parenthesizedExpression": true
@@ -181,5 +145,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/76/expected.json b/test/fixtures/flow/type-annotations/76/expected.json
index 886eacd2fa..570e71ace1 100644
--- a/test/fixtures/flow/type-annotations/76/expected.json
+++ b/test/fixtures/flow/type-annotations/76/expected.json
@@ -12,10 +12,6 @@
       "column": 39
     }
   },
-  "range": [
-    0,
-    39
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 39
       }
     },
-    "range": [
-      0,
-      39
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 39
           }
         },
-        "range": [
-          0,
-          39
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 38
               }
             },
-            "range": [
-              4,
-              38
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 7
                 }
               },
-              "range": [
-                4,
-                7
-              ],
               "name": "foo"
             },
             "init": {
@@ -107,10 +87,6 @@
                   "column": 37
                 }
               },
-              "range": [
-                11,
-                37
-              ],
               "returnType": {
                 "type": "TypeAnnotation",
                 "start": 22,
@@ -125,10 +101,6 @@
                     "column": 30
                   }
                 },
-                "range": [
-                  22,
-                  30
-                ],
                 "typeAnnotation": {
                   "type": "NumberTypeAnnotation",
                   "start": 24,
@@ -142,11 +114,7 @@
                       "line": 1,
                       "column": 30
                     }
-                  },
-                  "range": [
-                    24,
-                    30
-                  ]
+                  }
                 }
               },
               "id": null,
@@ -168,10 +136,6 @@
                       "column": 21
                     }
                   },
-                  "range": [
-                    18,
-                    21
-                  ],
                   "name": "bar"
                 }
               ],
@@ -189,10 +153,6 @@
                     "column": 37
                   }
                 },
-                "range": [
-                  34,
-                  37
-                ],
                 "name": "bar"
               },
               "parenthesizedExpression": true
@@ -202,5 +162,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/77/expected.json b/test/fixtures/flow/type-annotations/77/expected.json
index 2a6bb89d5b..4a52df6ade 100644
--- a/test/fixtures/flow/type-annotations/77/expected.json
+++ b/test/fixtures/flow/type-annotations/77/expected.json
@@ -12,10 +12,6 @@
       "column": 49
     }
   },
-  "range": [
-    0,
-    49
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 49
       }
     },
-    "range": [
-      0,
-      49
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 49
           }
         },
-        "range": [
-          0,
-          49
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 48
               }
             },
-            "range": [
-              4,
-              48
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 7
                 }
               },
-              "range": [
-                4,
-                7
-              ],
               "name": "foo"
             },
             "init": {
@@ -107,10 +87,6 @@
                   "column": 47
                 }
               },
-              "range": [
-                11,
-                47
-              ],
               "expression": {
                 "type": "ArrowFunctionExpression",
                 "start": 12,
@@ -125,10 +101,6 @@
                     "column": 38
                   }
                 },
-                "range": [
-                  12,
-                  38
-                ],
                 "returnType": {
                   "type": "TypeAnnotation",
                   "start": 23,
@@ -143,10 +115,6 @@
                       "column": 31
                     }
                   },
-                  "range": [
-                    23,
-                    31
-                  ],
                   "typeAnnotation": {
                     "type": "NumberTypeAnnotation",
                     "start": 25,
@@ -160,11 +128,7 @@
                         "line": 1,
                         "column": 31
                       }
-                    },
-                    "range": [
-                      25,
-                      31
-                    ]
+                    }
                   }
                 },
                 "id": null,
@@ -186,10 +150,6 @@
                         "column": 22
                       }
                     },
-                    "range": [
-                      19,
-                      22
-                    ],
                     "name": "bar"
                   }
                 ],
@@ -207,10 +167,6 @@
                       "column": 38
                     }
                   },
-                  "range": [
-                    35,
-                    38
-                  ],
                   "name": "bar"
                 },
                 "parenthesizedExpression": true
@@ -229,10 +185,6 @@
                     "column": 47
                   }
                 },
-                "range": [
-                  39,
-                  47
-                ],
                 "typeAnnotation": {
                   "type": "NumberTypeAnnotation",
                   "start": 41,
@@ -246,11 +198,7 @@
                       "line": 1,
                       "column": 47
                     }
-                  },
-                  "range": [
-                    41,
-                    47
-                  ]
+                  }
                 }
               },
               "parenthesizedExpression": true
@@ -260,5 +208,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/78/expected.json b/test/fixtures/flow/type-annotations/78/expected.json
index 445b8e19a4..27a670dddc 100644
--- a/test/fixtures/flow/type-annotations/78/expected.json
+++ b/test/fixtures/flow/type-annotations/78/expected.json
@@ -12,10 +12,6 @@
       "column": 31
     }
   },
-  "range": [
-    0,
-    31
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 31
       }
     },
-    "range": [
-      0,
-      31
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 31
           }
         },
-        "range": [
-          0,
-          31
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 30
               }
             },
-            "range": [
-              4,
-              30
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 7
                 }
               },
-              "range": [
-                4,
-                7
-              ],
               "name": "foo"
             },
             "init": {
@@ -107,10 +87,6 @@
                   "column": 30
                 }
               },
-              "range": [
-                10,
-                30
-              ],
               "test": {
                 "type": "Identifier",
                 "start": 10,
@@ -125,10 +101,6 @@
                     "column": 13
                   }
                 },
-                "range": [
-                  10,
-                  13
-                ],
                 "name": "bar"
               },
               "consequent": {
@@ -145,10 +117,6 @@
                     "column": 20
                   }
                 },
-                "range": [
-                  17,
-                  20
-                ],
                 "name": "foo",
                 "parenthesizedExpression": true
               },
@@ -166,10 +134,6 @@
                     "column": 30
                   }
                 },
-                "range": [
-                  24,
-                  30
-                ],
                 "name": "number"
               }
             }
@@ -178,5 +142,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/79/expected.json b/test/fixtures/flow/type-annotations/79/expected.json
index 76363ac712..31d7654fb3 100644
--- a/test/fixtures/flow/type-annotations/79/expected.json
+++ b/test/fixtures/flow/type-annotations/79/expected.json
@@ -12,10 +12,6 @@
       "column": 43
     }
   },
-  "range": [
-    0,
-    43
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 43
       }
     },
-    "range": [
-      0,
-      43
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 43
           }
         },
-        "range": [
-          0,
-          43
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 42
               }
             },
-            "range": [
-              4,
-              42
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 7
                 }
               },
-              "range": [
-                4,
-                7
-              ],
               "name": "foo"
             },
             "init": {
@@ -107,10 +87,6 @@
                   "column": 42
                 }
               },
-              "range": [
-                10,
-                42
-              ],
               "test": {
                 "type": "Identifier",
                 "start": 10,
@@ -125,10 +101,6 @@
                     "column": 13
                   }
                 },
-                "range": [
-                  10,
-                  13
-                ],
                 "name": "bar"
               },
               "consequent": {
@@ -145,10 +117,6 @@
                     "column": 36
                   }
                 },
-                "range": [
-                  16,
-                  36
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -168,10 +136,6 @@
                         "column": 20
                       }
                     },
-                    "range": [
-                      17,
-                      20
-                    ],
                     "name": "foo",
                     "parenthesizedExpression": true
                   }
@@ -190,10 +154,6 @@
                       "column": 36
                     }
                   },
-                  "range": [
-                    34,
-                    36
-                  ],
                   "body": []
                 },
                 "returnType": {
@@ -210,10 +170,6 @@
                       "column": 30
                     }
                   },
-                  "range": [
-                    22,
-                    30
-                  ],
                   "typeAnnotation": {
                     "type": "NumberTypeAnnotation",
                     "start": 24,
@@ -227,11 +183,7 @@
                         "line": 1,
                         "column": 30
                       }
-                    },
-                    "range": [
-                      24,
-                      30
-                    ]
+                    }
                   }
                 }
               },
@@ -249,10 +201,6 @@
                     "column": 42
                   }
                 },
-                "range": [
-                  39,
-                  42
-                ],
                 "name": "baz"
               }
             }
@@ -261,5 +209,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/8/expected.json b/test/fixtures/flow/type-annotations/8/expected.json
index 8f0cd2c669..e0be8e9149 100644
--- a/test/fixtures/flow/type-annotations/8/expected.json
+++ b/test/fixtures/flow/type-annotations/8/expected.json
@@ -12,10 +12,6 @@
       "column": 38
     }
   },
-  "range": [
-    0,
-    38
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 38
       }
     },
-    "range": [
-      0,
-      38
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 38
           }
         },
-        "range": [
-          0,
-          38
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            9,
-            12
-          ],
           "name": "foo"
         },
         "generator": false,
@@ -92,10 +76,6 @@
                 "column": 35
               }
             },
-            "range": [
-              13,
-              35
-            ],
             "name": "callback",
             "typeAnnotation": {
               "type": "TypeAnnotation",
@@ -111,10 +91,6 @@
                   "column": 35
                 }
               },
-              "range": [
-                21,
-                35
-              ],
               "typeAnnotation": {
                 "type": "FunctionTypeAnnotation",
                 "start": 23,
@@ -129,10 +105,6 @@
                     "column": 35
                   }
                 },
-                "range": [
-                  23,
-                  35
-                ],
                 "params": [],
                 "rest": null,
                 "returnType": {
@@ -148,11 +120,7 @@
                       "line": 1,
                       "column": 35
                     }
-                  },
-                  "range": [
-                    29,
-                    35
-                  ]
+                  }
                 },
                 "typeParameters": null
               }
@@ -173,13 +141,10 @@
               "column": 38
             }
           },
-          "range": [
-            36,
-            38
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/80/expected.json b/test/fixtures/flow/type-annotations/80/expected.json
index ee3a8316b7..c1029e52d9 100644
--- a/test/fixtures/flow/type-annotations/80/expected.json
+++ b/test/fixtures/flow/type-annotations/80/expected.json
@@ -12,10 +12,6 @@
       "column": 34
     }
   },
-  "range": [
-    0,
-    34
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 34
       }
     },
-    "range": [
-      0,
-      34
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 34
           }
         },
-        "range": [
-          0,
-          34
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 1,
@@ -68,10 +56,6 @@
               "column": 33
             }
           },
-          "range": [
-            1,
-            33
-          ],
           "id": null,
           "generator": false,
           "expression": true,
@@ -91,10 +75,6 @@
                   "column": 9
                 }
               },
-              "range": [
-                2,
-                9
-              ],
               "argument": {
                 "type": "Identifier",
                 "start": 5,
@@ -109,10 +89,6 @@
                     "column": 9
                   }
                 },
-                "range": [
-                  5,
-                  9
-                ],
                 "name": "rest"
               },
               "typeAnnotation": {
@@ -129,10 +105,6 @@
                     "column": 24
                   }
                 },
-                "range": [
-                  9,
-                  24
-                ],
                 "typeAnnotation": {
                   "type": "GenericTypeAnnotation",
                   "start": 11,
@@ -147,10 +119,6 @@
                       "column": 24
                     }
                   },
-                  "range": [
-                    11,
-                    24
-                  ],
                   "typeParameters": {
                     "type": "TypeParameterInstantiation",
                     "start": 16,
@@ -165,10 +133,6 @@
                         "column": 24
                       }
                     },
-                    "range": [
-                      16,
-                      24
-                    ],
                     "params": [
                       {
                         "type": "NumberTypeAnnotation",
@@ -183,11 +147,7 @@
                             "line": 1,
                             "column": 23
                           }
-                        },
-                        "range": [
-                          17,
-                          23
-                        ]
+                        }
                       }
                     ]
                   },
@@ -205,10 +165,6 @@
                         "column": 16
                       }
                     },
-                    "range": [
-                      11,
-                      16
-                    ],
                     "name": "Array"
                   }
                 }
@@ -229,15 +185,12 @@
                 "column": 33
               }
             },
-            "range": [
-              29,
-              33
-            ],
             "name": "rest"
           },
           "parenthesizedExpression": true
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/81/expected.json b/test/fixtures/flow/type-annotations/81/expected.json
index d2a2b04ced..3c84d22193 100644
--- a/test/fixtures/flow/type-annotations/81/expected.json
+++ b/test/fixtures/flow/type-annotations/81/expected.json
@@ -12,10 +12,6 @@
       "column": 34
     }
   },
-  "range": [
-    0,
-    34
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 34
       }
     },
-    "range": [
-      0,
-      34
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 34
           }
         },
-        "range": [
-          0,
-          34
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 34
               }
             },
-            "range": [
-              4,
-              34
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 34
                 }
               },
-              "range": [
-                4,
-                34
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 34
                   }
                 },
-                "range": [
-                  5,
-                  34
-                ],
                 "typeAnnotation": {
                   "type": "GenericTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 34
                     }
                   },
-                  "range": [
-                    7,
-                    34
-                  ],
                   "typeParameters": {
                     "type": "TypeParameterInstantiation",
                     "start": 10,
@@ -142,10 +114,6 @@
                         "column": 34
                       }
                     },
-                    "range": [
-                      10,
-                      34
-                    ],
                     "params": [
                       {
                         "type": "StringTypeAnnotation",
@@ -160,11 +128,7 @@
                             "line": 1,
                             "column": 17
                           }
-                        },
-                        "range": [
-                          11,
-                          17
-                        ]
+                        }
                       },
                       {
                         "type": "GenericTypeAnnotation",
@@ -180,10 +144,6 @@
                             "column": 32
                           }
                         },
-                        "range": [
-                          19,
-                          32
-                        ],
                         "typeParameters": {
                           "type": "TypeParameterInstantiation",
                           "start": 24,
@@ -198,10 +158,6 @@
                               "column": 32
                             }
                           },
-                          "range": [
-                            24,
-                            32
-                          ],
                           "params": [
                             {
                               "type": "StringTypeAnnotation",
@@ -216,11 +172,7 @@
                                   "line": 1,
                                   "column": 31
                                 }
-                              },
-                              "range": [
-                                25,
-                                31
-                              ]
+                              }
                             }
                           ]
                         },
@@ -238,10 +190,6 @@
                               "column": 24
                             }
                           },
-                          "range": [
-                            19,
-                            24
-                          ],
                           "name": "Array"
                         }
                       }
@@ -261,10 +209,6 @@
                         "column": 10
                       }
                     },
-                    "range": [
-                      7,
-                      10
-                    ],
                     "name": "Map"
                   }
                 }
@@ -276,5 +220,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/82/expected.json b/test/fixtures/flow/type-annotations/82/expected.json
index 4c1d10ed3d..f7e3aa404c 100644
--- a/test/fixtures/flow/type-annotations/82/expected.json
+++ b/test/fixtures/flow/type-annotations/82/expected.json
@@ -12,10 +12,6 @@
       "column": 33
     }
   },
-  "range": [
-    0,
-    33
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 33
       }
     },
-    "range": [
-      0,
-      33
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 33
           }
         },
-        "range": [
-          0,
-          33
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 33
               }
             },
-            "range": [
-              4,
-              33
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 33
                 }
               },
-              "range": [
-                4,
-                33
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 33
                   }
                 },
-                "range": [
-                  5,
-                  33
-                ],
                 "typeAnnotation": {
                   "type": "GenericTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 33
                     }
                   },
-                  "range": [
-                    7,
-                    33
-                  ],
                   "typeParameters": {
                     "type": "TypeParameterInstantiation",
                     "start": 10,
@@ -142,10 +114,6 @@
                         "column": 33
                       }
                     },
-                    "range": [
-                      10,
-                      33
-                    ],
                     "params": [
                       {
                         "type": "StringTypeAnnotation",
@@ -160,11 +128,7 @@
                             "line": 1,
                             "column": 17
                           }
-                        },
-                        "range": [
-                          11,
-                          17
-                        ]
+                        }
                       },
                       {
                         "type": "GenericTypeAnnotation",
@@ -180,10 +144,6 @@
                             "column": 32
                           }
                         },
-                        "range": [
-                          19,
-                          32
-                        ],
                         "typeParameters": {
                           "type": "TypeParameterInstantiation",
                           "start": 24,
@@ -198,10 +158,6 @@
                               "column": 32
                             }
                           },
-                          "range": [
-                            24,
-                            32
-                          ],
                           "params": [
                             {
                               "type": "StringTypeAnnotation",
@@ -216,11 +172,7 @@
                                   "line": 1,
                                   "column": 31
                                 }
-                              },
-                              "range": [
-                                25,
-                                31
-                              ]
+                              }
                             }
                           ]
                         },
@@ -238,10 +190,6 @@
                               "column": 24
                             }
                           },
-                          "range": [
-                            19,
-                            24
-                          ],
                           "name": "Array"
                         }
                       }
@@ -261,10 +209,6 @@
                         "column": 10
                       }
                     },
-                    "range": [
-                      7,
-                      10
-                    ],
                     "name": "Map"
                   }
                 }
@@ -276,5 +220,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/83/expected.json b/test/fixtures/flow/type-annotations/83/expected.json
index 4e440eea85..ec761b745f 100644
--- a/test/fixtures/flow/type-annotations/83/expected.json
+++ b/test/fixtures/flow/type-annotations/83/expected.json
@@ -12,10 +12,6 @@
       "column": 15
     }
   },
-  "range": [
-    0,
-    15
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 15
       }
     },
-    "range": [
-      0,
-      15
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 15
           }
         },
-        "range": [
-          0,
-          15
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 15
               }
             },
-            "range": [
-              4,
-              15
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 15
                 }
               },
-              "range": [
-                4,
-                15
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 15
                   }
                 },
-                "range": [
-                  5,
-                  15
-                ],
                 "typeAnnotation": {
                   "type": "ArrayTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 15
                     }
                   },
-                  "range": [
-                    7,
-                    15
-                  ],
                   "elementType": {
                     "type": "NumberTypeAnnotation",
                     "start": 7,
@@ -141,11 +113,7 @@
                         "line": 1,
                         "column": 13
                       }
-                    },
-                    "range": [
-                      7,
-                      13
-                    ]
+                    }
                   }
                 }
               }
@@ -156,5 +124,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/84/expected.json b/test/fixtures/flow/type-annotations/84/expected.json
index 6eb3373171..72f1dcf9d6 100644
--- a/test/fixtures/flow/type-annotations/84/expected.json
+++ b/test/fixtures/flow/type-annotations/84/expected.json
@@ -12,10 +12,6 @@
       "column": 16
     }
   },
-  "range": [
-    0,
-    16
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 16
       }
     },
-    "range": [
-      0,
-      16
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 16
           }
         },
-        "range": [
-          0,
-          16
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 16
               }
             },
-            "range": [
-              4,
-              16
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 16
                 }
               },
-              "range": [
-                4,
-                16
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 16
                   }
                 },
-                "range": [
-                  5,
-                  16
-                ],
                 "typeAnnotation": {
                   "type": "NullableTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 16
                     }
                   },
-                  "range": [
-                    7,
-                    16
-                  ],
                   "typeAnnotation": {
                     "type": "ArrayTypeAnnotation",
                     "start": 8,
@@ -142,10 +114,6 @@
                         "column": 16
                       }
                     },
-                    "range": [
-                      8,
-                      16
-                    ],
                     "elementType": {
                       "type": "StringTypeAnnotation",
                       "start": 8,
@@ -159,11 +127,7 @@
                           "line": 1,
                           "column": 14
                         }
-                      },
-                      "range": [
-                        8,
-                        14
-                      ]
+                      }
                     }
                   }
                 }
@@ -175,5 +139,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/85/expected.json b/test/fixtures/flow/type-annotations/85/expected.json
index 89ead7f3d5..2ec29ac271 100644
--- a/test/fixtures/flow/type-annotations/85/expected.json
+++ b/test/fixtures/flow/type-annotations/85/expected.json
@@ -12,10 +12,6 @@
       "column": 22
     }
   },
-  "range": [
-    0,
-    22
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 22
       }
     },
-    "range": [
-      0,
-      22
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 22
           }
         },
-        "range": [
-          0,
-          22
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 22
               }
             },
-            "range": [
-              4,
-              22
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 22
                 }
               },
-              "range": [
-                4,
-                22
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 22
                   }
                 },
-                "range": [
-                  5,
-                  22
-                ],
                 "typeAnnotation": {
                   "type": "ArrayTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 22
                     }
                   },
-                  "range": [
-                    7,
-                    22
-                  ],
                   "elementType": {
                     "type": "GenericTypeAnnotation",
                     "start": 7,
@@ -142,10 +114,6 @@
                         "column": 20
                       }
                     },
-                    "range": [
-                      7,
-                      20
-                    ],
                     "typeParameters": {
                       "type": "TypeParameterInstantiation",
                       "start": 14,
@@ -160,10 +128,6 @@
                           "column": 20
                         }
                       },
-                      "range": [
-                        14,
-                        20
-                      ],
                       "params": [
                         {
                           "type": "BooleanTypeAnnotation",
@@ -178,11 +142,7 @@
                               "line": 1,
                               "column": 19
                             }
-                          },
-                          "range": [
-                            15,
-                            19
-                          ]
+                          }
                         }
                       ]
                     },
@@ -200,10 +160,6 @@
                           "column": 14
                         }
                       },
-                      "range": [
-                        7,
-                        14
-                      ],
                       "name": "Promise"
                     }
                   }
@@ -216,5 +172,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/86/expected.json b/test/fixtures/flow/type-annotations/86/expected.json
index 5f9dd591cf..910267d15d 100644
--- a/test/fixtures/flow/type-annotations/86/expected.json
+++ b/test/fixtures/flow/type-annotations/86/expected.json
@@ -12,10 +12,6 @@
       "column": 39
     }
   },
-  "range": [
-    0,
-    39
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 39
       }
     },
-    "range": [
-      0,
-      39
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 39
           }
         },
-        "range": [
-          0,
-          39
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 39
               }
             },
-            "range": [
-              4,
-              39
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 39
                 }
               },
-              "range": [
-                4,
-                39
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 39
                   }
                 },
-                "range": [
-                  5,
-                  39
-                ],
                 "typeAnnotation": {
                   "type": "FunctionTypeAnnotation",
                   "start": 6,
@@ -124,10 +100,6 @@
                       "column": 39
                     }
                   },
-                  "range": [
-                    6,
-                    39
-                  ],
                   "params": [],
                   "rest": {
                     "type": "FunctionTypeParam",
@@ -143,10 +115,6 @@
                         "column": 28
                       }
                     },
-                    "range": [
-                      10,
-                      28
-                    ],
                     "name": {
                       "type": "Identifier",
                       "start": 10,
@@ -161,10 +129,6 @@
                           "column": 14
                         }
                       },
-                      "range": [
-                        10,
-                        14
-                      ],
                       "name": "rest"
                     },
                     "optional": false,
@@ -182,10 +146,6 @@
                           "column": 28
                         }
                       },
-                      "range": [
-                        15,
-                        28
-                      ],
                       "typeParameters": {
                         "type": "TypeParameterInstantiation",
                         "start": 20,
@@ -200,10 +160,6 @@
                             "column": 28
                           }
                         },
-                        "range": [
-                          20,
-                          28
-                        ],
                         "params": [
                           {
                             "type": "NumberTypeAnnotation",
@@ -218,11 +174,7 @@
                                 "line": 1,
                                 "column": 27
                               }
-                            },
-                            "range": [
-                              21,
-                              27
-                            ]
+                            }
                           }
                         ]
                       },
@@ -240,10 +192,6 @@
                             "column": 20
                           }
                         },
-                        "range": [
-                          15,
-                          20
-                        ],
                         "name": "Array"
                       }
                     }
@@ -261,11 +209,7 @@
                         "line": 1,
                         "column": 39
                       }
-                    },
-                    "range": [
-                      33,
-                      39
-                    ]
+                    }
                   },
                   "typeParameters": null
                 }
@@ -277,5 +221,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/87/expected.json b/test/fixtures/flow/type-annotations/87/expected.json
index d87ee24178..b84eef4224 100644
--- a/test/fixtures/flow/type-annotations/87/expected.json
+++ b/test/fixtures/flow/type-annotations/87/expected.json
@@ -12,10 +12,6 @@
       "column": 28
     }
   },
-  "range": [
-    0,
-    28
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 28
       }
     },
-    "range": [
-      0,
-      28
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 28
           }
         },
-        "range": [
-          0,
-          28
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 28
               }
             },
-            "range": [
-              4,
-              28
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 28
                 }
               },
-              "range": [
-                4,
-                28
-              ],
               "name": "identity",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 28
                   }
                 },
-                "range": [
-                  12,
-                  28
-                ],
                 "typeAnnotation": {
                   "type": "FunctionTypeAnnotation",
                   "start": 14,
@@ -124,10 +100,6 @@
                       "column": 28
                     }
                   },
-                  "range": [
-                    14,
-                    28
-                  ],
                   "typeParameters": {
                     "type": "TypeParameterDeclaration",
                     "start": 14,
@@ -142,10 +114,6 @@
                         "column": 17
                       }
                     },
-                    "range": [
-                      14,
-                      17
-                    ],
                     "params": [
                       {
                         "type": "Identifier",
@@ -161,10 +129,6 @@
                             "column": 16
                           }
                         },
-                        "range": [
-                          15,
-                          16
-                        ],
                         "name": "T"
                       }
                     ]
@@ -184,10 +148,6 @@
                           "column": 22
                         }
                       },
-                      "range": [
-                        18,
-                        22
-                      ],
                       "name": {
                         "type": "Identifier",
                         "start": 18,
@@ -202,10 +162,6 @@
                             "column": 19
                           }
                         },
-                        "range": [
-                          18,
-                          19
-                        ],
                         "name": "x"
                       },
                       "optional": false,
@@ -223,10 +179,6 @@
                             "column": 22
                           }
                         },
-                        "range": [
-                          21,
-                          22
-                        ],
                         "typeParameters": null,
                         "id": {
                           "type": "Identifier",
@@ -242,10 +194,6 @@
                               "column": 22
                             }
                           },
-                          "range": [
-                            21,
-                            22
-                          ],
                           "name": "T"
                         }
                       }
@@ -266,10 +214,6 @@
                         "column": 28
                       }
                     },
-                    "range": [
-                      27,
-                      28
-                    ],
                     "typeParameters": null,
                     "id": {
                       "type": "Identifier",
@@ -285,10 +229,6 @@
                           "column": 28
                         }
                       },
-                      "range": [
-                        27,
-                        28
-                      ],
                       "name": "T"
                     }
                   }
@@ -301,5 +241,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/88/expected.json b/test/fixtures/flow/type-annotations/88/expected.json
index 4e03f0ee83..dc7f4ddcce 100644
--- a/test/fixtures/flow/type-annotations/88/expected.json
+++ b/test/fixtures/flow/type-annotations/88/expected.json
@@ -12,10 +12,6 @@
       "column": 38
     }
   },
-  "range": [
-    0,
-    38
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 38
       }
     },
-    "range": [
-      0,
-      38
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 38
           }
         },
-        "range": [
-          0,
-          38
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 38
               }
             },
-            "range": [
-              4,
-              38
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 38
                 }
               },
-              "range": [
-                4,
-                38
-              ],
               "name": "identity",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 38
                   }
                 },
-                "range": [
-                  12,
-                  38
-                ],
                 "typeAnnotation": {
                   "type": "FunctionTypeAnnotation",
                   "start": 14,
@@ -124,10 +100,6 @@
                       "column": 38
                     }
                   },
-                  "range": [
-                    14,
-                    38
-                  ],
                   "typeParameters": {
                     "type": "TypeParameterDeclaration",
                     "start": 14,
@@ -142,10 +114,6 @@
                         "column": 17
                       }
                     },
-                    "range": [
-                      14,
-                      17
-                    ],
                     "params": [
                       {
                         "type": "Identifier",
@@ -161,10 +129,6 @@
                             "column": 16
                           }
                         },
-                        "range": [
-                          15,
-                          16
-                        ],
                         "name": "T"
                       }
                     ]
@@ -184,10 +148,6 @@
                           "column": 22
                         }
                       },
-                      "range": [
-                        18,
-                        22
-                      ],
                       "name": {
                         "type": "Identifier",
                         "start": 18,
@@ -202,10 +162,6 @@
                             "column": 19
                           }
                         },
-                        "range": [
-                          18,
-                          19
-                        ],
                         "name": "x"
                       },
                       "optional": false,
@@ -223,10 +179,6 @@
                             "column": 22
                           }
                         },
-                        "range": [
-                          21,
-                          22
-                        ],
                         "typeParameters": null,
                         "id": {
                           "type": "Identifier",
@@ -242,10 +194,6 @@
                               "column": 22
                             }
                           },
-                          "range": [
-                            21,
-                            22
-                          ],
                           "name": "T"
                         }
                       }
@@ -265,10 +213,6 @@
                         "column": 32
                       }
                     },
-                    "range": [
-                      27,
-                      32
-                    ],
                     "name": {
                       "type": "Identifier",
                       "start": 27,
@@ -283,10 +227,6 @@
                           "column": 28
                         }
                       },
-                      "range": [
-                        27,
-                        28
-                      ],
                       "name": "y"
                     },
                     "optional": false,
@@ -304,10 +244,6 @@
                           "column": 32
                         }
                       },
-                      "range": [
-                        29,
-                        32
-                      ],
                       "elementType": {
                         "type": "GenericTypeAnnotation",
                         "start": 29,
@@ -322,10 +258,6 @@
                             "column": 30
                           }
                         },
-                        "range": [
-                          29,
-                          30
-                        ],
                         "typeParameters": null,
                         "id": {
                           "type": "Identifier",
@@ -341,10 +273,6 @@
                               "column": 30
                             }
                           },
-                          "range": [
-                            29,
-                            30
-                          ],
                           "name": "T"
                         }
                       }
@@ -364,10 +292,6 @@
                         "column": 38
                       }
                     },
-                    "range": [
-                      37,
-                      38
-                    ],
                     "typeParameters": null,
                     "id": {
                       "type": "Identifier",
@@ -383,10 +307,6 @@
                           "column": 38
                         }
                       },
-                      "range": [
-                        37,
-                        38
-                      ],
                       "name": "T"
                     }
                   }
@@ -399,5 +319,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/89/expected.json b/test/fixtures/flow/type-annotations/89/expected.json
index f2a682f5f6..6e9f5fb118 100644
--- a/test/fixtures/flow/type-annotations/89/expected.json
+++ b/test/fixtures/flow/type-annotations/89/expected.json
@@ -12,10 +12,6 @@
       "column": 27
     }
   },
-  "range": [
-    0,
-    27
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 27
       }
     },
-    "range": [
-      0,
-      27
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 27
           }
         },
-        "range": [
-          0,
-          27
-        ],
         "specifiers": [
           {
             "type": "ImportDefaultSpecifier",
@@ -69,10 +57,6 @@
                 "column": 15
               }
             },
-            "range": [
-              12,
-              15
-            ],
             "local": {
               "type": "Identifier",
               "start": 12,
@@ -87,10 +71,6 @@
                   "column": 15
                 }
               },
-              "range": [
-                12,
-                15
-              ],
               "name": "foo"
             }
           }
@@ -110,15 +90,12 @@
               "column": 26
             }
           },
-          "range": [
-            21,
-            26
-          ],
           "value": "bar",
           "rawValue": "bar",
           "raw": "\"bar\""
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/9/expected.json b/test/fixtures/flow/type-annotations/9/expected.json
index 25314ba131..248c8fd763 100644
--- a/test/fixtures/flow/type-annotations/9/expected.json
+++ b/test/fixtures/flow/type-annotations/9/expected.json
@@ -12,10 +12,6 @@
       "column": 44
     }
   },
-  "range": [
-    0,
-    44
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 44
       }
     },
-    "range": [
-      0,
-      44
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 44
           }
         },
-        "range": [
-          0,
-          44
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            9,
-            12
-          ],
           "name": "foo"
         },
         "generator": false,
@@ -92,10 +76,6 @@
                 "column": 41
               }
             },
-            "range": [
-              13,
-              41
-            ],
             "name": "callback",
             "typeAnnotation": {
               "type": "TypeAnnotation",
@@ -111,10 +91,6 @@
                   "column": 41
                 }
               },
-              "range": [
-                21,
-                41
-              ],
               "typeAnnotation": {
                 "type": "FunctionTypeAnnotation",
                 "start": 23,
@@ -129,10 +105,6 @@
                     "column": 41
                   }
                 },
-                "range": [
-                  23,
-                  41
-                ],
                 "params": [
                   {
                     "type": "FunctionTypeParam",
@@ -148,10 +120,6 @@
                         "column": 30
                       }
                     },
-                    "range": [
-                      24,
-                      30
-                    ],
                     "name": {
                       "type": "Identifier",
                       "start": 24,
@@ -166,10 +134,6 @@
                           "column": 25
                         }
                       },
-                      "range": [
-                        24,
-                        25
-                      ],
                       "name": "_"
                     },
                     "optional": false,
@@ -186,11 +150,7 @@
                           "line": 1,
                           "column": 30
                         }
-                      },
-                      "range": [
-                        26,
-                        30
-                      ]
+                      }
                     }
                   }
                 ],
@@ -208,11 +168,7 @@
                       "line": 1,
                       "column": 41
                     }
-                  },
-                  "range": [
-                    35,
-                    41
-                  ]
+                  }
                 },
                 "typeParameters": null
               }
@@ -233,13 +189,10 @@
               "column": 44
             }
           },
-          "range": [
-            42,
-            44
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/90/expected.json b/test/fixtures/flow/type-annotations/90/expected.json
index b3ec5ff963..6a3d90e3fc 100644
--- a/test/fixtures/flow/type-annotations/90/expected.json
+++ b/test/fixtures/flow/type-annotations/90/expected.json
@@ -12,10 +12,6 @@
       "column": 29
     }
   },
-  "range": [
-    0,
-    29
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 29
       }
     },
-    "range": [
-      0,
-      29
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 29
           }
         },
-        "range": [
-          0,
-          29
-        ],
         "specifiers": [
           {
             "type": "ImportDefaultSpecifier",
@@ -69,10 +57,6 @@
                 "column": 17
               }
             },
-            "range": [
-              14,
-              17
-            ],
             "local": {
               "type": "Identifier",
               "start": 14,
@@ -87,10 +71,6 @@
                   "column": 17
                 }
               },
-              "range": [
-                14,
-                17
-              ],
               "name": "foo"
             }
           }
@@ -110,15 +90,12 @@
               "column": 28
             }
           },
-          "range": [
-            23,
-            28
-          ],
           "value": "bar",
           "rawValue": "bar",
           "raw": "\"bar\""
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/91/expected.json b/test/fixtures/flow/type-annotations/91/expected.json
index 5820f79d18..c89dc1f3e2 100644
--- a/test/fixtures/flow/type-annotations/91/expected.json
+++ b/test/fixtures/flow/type-annotations/91/expected.json
@@ -12,10 +12,6 @@
       "column": 34
     }
   },
-  "range": [
-    0,
-    34
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 34
       }
     },
-    "range": [
-      0,
-      34
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 34
           }
         },
-        "range": [
-          0,
-          34
-        ],
         "specifiers": [
           {
             "type": "ImportSpecifier",
@@ -69,10 +57,6 @@
                 "column": 16
               }
             },
-            "range": [
-              13,
-              16
-            ],
             "imported": {
               "type": "Identifier",
               "start": 13,
@@ -87,10 +71,6 @@
                   "column": 16
                 }
               },
-              "range": [
-                13,
-                16
-              ],
               "name": "foo"
             },
             "local": {
@@ -107,10 +87,6 @@
                   "column": 16
                 }
               },
-              "range": [
-                13,
-                16
-              ],
               "name": "foo"
             }
           },
@@ -128,10 +104,6 @@
                 "column": 21
               }
             },
-            "range": [
-              18,
-              21
-            ],
             "imported": {
               "type": "Identifier",
               "start": 18,
@@ -146,10 +118,6 @@
                   "column": 21
                 }
               },
-              "range": [
-                18,
-                21
-              ],
               "name": "bar"
             },
             "local": {
@@ -166,10 +134,6 @@
                   "column": 21
                 }
               },
-              "range": [
-                18,
-                21
-              ],
               "name": "bar"
             }
           }
@@ -189,15 +153,12 @@
               "column": 33
             }
           },
-          "range": [
-            28,
-            33
-          ],
           "value": "baz",
           "rawValue": "baz",
           "raw": "\"baz\""
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/92/expected.json b/test/fixtures/flow/type-annotations/92/expected.json
index 9e80c53c8d..bc7f70f9d0 100644
--- a/test/fixtures/flow/type-annotations/92/expected.json
+++ b/test/fixtures/flow/type-annotations/92/expected.json
@@ -12,10 +12,6 @@
       "column": 38
     }
   },
-  "range": [
-    0,
-    38
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 38
       }
     },
-    "range": [
-      0,
-      38
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 38
           }
         },
-        "range": [
-          0,
-          38
-        ],
         "specifiers": [
           {
             "type": "ImportSpecifier",
@@ -69,10 +57,6 @@
                 "column": 25
               }
             },
-            "range": [
-              15,
-              25
-            ],
             "imported": {
               "type": "Identifier",
               "start": 15,
@@ -87,10 +71,6 @@
                   "column": 18
                 }
               },
-              "range": [
-                15,
-                18
-              ],
               "name": "foo"
             },
             "local": {
@@ -107,10 +87,6 @@
                   "column": 25
                 }
               },
-              "range": [
-                22,
-                25
-              ],
               "name": "bar"
             }
           }
@@ -130,15 +106,12 @@
               "column": 37
             }
           },
-          "range": [
-            32,
-            37
-          ],
           "value": "baz",
           "rawValue": "baz",
           "raw": "\"baz\""
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/93/expected.json b/test/fixtures/flow/type-annotations/93/expected.json
index eede45e979..ea96875cff 100644
--- a/test/fixtures/flow/type-annotations/93/expected.json
+++ b/test/fixtures/flow/type-annotations/93/expected.json
@@ -12,10 +12,6 @@
       "column": 23
     }
   },
-  "range": [
-    0,
-    23
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 23
       }
     },
-    "range": [
-      0,
-      23
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 23
           }
         },
-        "range": [
-          0,
-          23
-        ],
         "specifiers": [
           {
             "type": "ImportDefaultSpecifier",
@@ -69,10 +57,6 @@
                 "column": 11
               }
             },
-            "range": [
-              7,
-              11
-            ],
             "local": {
               "type": "Identifier",
               "start": 7,
@@ -87,10 +71,6 @@
                   "column": 11
                 }
               },
-              "range": [
-                7,
-                11
-              ],
               "name": "type"
             }
           }
@@ -110,15 +90,12 @@
               "column": 22
             }
           },
-          "range": [
-            17,
-            22
-          ],
           "value": "foo",
           "rawValue": "foo",
           "raw": "\"foo\""
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/94/expected.json b/test/fixtures/flow/type-annotations/94/expected.json
index 8eb55e497d..68d7ec00e2 100644
--- a/test/fixtures/flow/type-annotations/94/expected.json
+++ b/test/fixtures/flow/type-annotations/94/expected.json
@@ -12,10 +12,6 @@
       "column": 30
     }
   },
-  "range": [
-    0,
-    30
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 30
       }
     },
-    "range": [
-      0,
-      30
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 30
           }
         },
-        "range": [
-          0,
-          30
-        ],
         "specifiers": [
           {
             "type": "ImportDefaultSpecifier",
@@ -69,10 +57,6 @@
                 "column": 11
               }
             },
-            "range": [
-              7,
-              11
-            ],
             "local": {
               "type": "Identifier",
               "start": 7,
@@ -87,10 +71,6 @@
                   "column": 11
                 }
               },
-              "range": [
-                7,
-                11
-              ],
               "name": "type"
             }
           },
@@ -108,10 +88,6 @@
                 "column": 17
               }
             },
-            "range": [
-              14,
-              17
-            ],
             "imported": {
               "type": "Identifier",
               "start": 14,
@@ -126,10 +102,6 @@
                   "column": 17
                 }
               },
-              "range": [
-                14,
-                17
-              ],
               "name": "foo"
             },
             "local": {
@@ -146,10 +118,6 @@
                   "column": 17
                 }
               },
-              "range": [
-                14,
-                17
-              ],
               "name": "foo"
             }
           }
@@ -169,15 +137,12 @@
               "column": 29
             }
           },
-          "range": [
-            24,
-            29
-          ],
           "value": "bar",
           "rawValue": "bar",
           "raw": "\"bar\""
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/95/expected.json b/test/fixtures/flow/type-annotations/95/expected.json
index 7fe928d5a9..ded0af06a1 100644
--- a/test/fixtures/flow/type-annotations/95/expected.json
+++ b/test/fixtures/flow/type-annotations/95/expected.json
@@ -12,10 +12,6 @@
       "column": 38
     }
   },
-  "range": [
-    0,
-    38
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 38
       }
     },
-    "range": [
-      0,
-      38
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 38
           }
         },
-        "range": [
-          0,
-          38
-        ],
         "specifiers": [
           {
             "type": "ImportNamespaceSpecifier",
@@ -69,10 +57,6 @@
                 "column": 26
               }
             },
-            "range": [
-              12,
-              26
-            ],
             "local": {
               "type": "Identifier",
               "start": 17,
@@ -87,10 +71,6 @@
                   "column": 26
                 }
               },
-              "range": [
-                17,
-                26
-              ],
               "name": "namespace"
             }
           }
@@ -110,15 +90,12 @@
               "column": 37
             }
           },
-          "range": [
-            32,
-            37
-          ],
           "value": "bar",
           "rawValue": "bar",
           "raw": "\"bar\""
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-annotations/96/expected.json b/test/fixtures/flow/type-annotations/96/expected.json
index 46e060d85a..c1262eb5ba 100644
--- a/test/fixtures/flow/type-annotations/96/expected.json
+++ b/test/fixtures/flow/type-annotations/96/expected.json
@@ -12,10 +12,6 @@
       "column": 40
     }
   },
-  "range": [
-    0,
-    40
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 40
       }
     },
-    "range": [
-      0,
-      40
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 40
           }
         },
-        "range": [
-          0,
-          40
-        ],
         "specifiers": [
           {
             "type": "ImportNamespaceSpecifier",
@@ -69,10 +57,6 @@
                 "column": 28
               }
             },
-            "range": [
-              14,
-              28
-            ],
             "local": {
               "type": "Identifier",
               "start": 19,
@@ -87,10 +71,6 @@
                   "column": 28
                 }
               },
-              "range": [
-                19,
-                28
-              ],
               "name": "namespace"
             }
           }
@@ -110,15 +90,12 @@
               "column": 39
             }
           },
-          "range": [
-            34,
-            39
-          ],
           "value": "bar",
           "rawValue": "bar",
           "raw": "\"bar\""
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-grouping/1/expected.json b/test/fixtures/flow/type-grouping/1/expected.json
index 2d535484a7..7b9b6309f8 100644
--- a/test/fixtures/flow/type-grouping/1/expected.json
+++ b/test/fixtures/flow/type-grouping/1/expected.json
@@ -12,10 +12,6 @@
       "column": 15
     }
   },
-  "range": [
-    0,
-    15
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 15
       }
     },
-    "range": [
-      0,
-      15
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 15
           }
         },
-        "range": [
-          0,
-          15
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 15
               }
             },
-            "range": [
-              4,
-              15
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 15
                 }
               },
-              "range": [
-                4,
-                15
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 15
                   }
                 },
-                "range": [
-                  5,
-                  15
-                ],
                 "typeAnnotation": {
                   "type": "NumberTypeAnnotation",
                   "start": 8,
@@ -123,11 +99,7 @@
                       "line": 1,
                       "column": 14
                     }
-                  },
-                  "range": [
-                    8,
-                    14
-                  ]
+                  }
                 }
               }
             },
@@ -137,5 +109,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-grouping/2/expected.json b/test/fixtures/flow/type-grouping/2/expected.json
index 5b2a8fe732..60fb976af8 100644
--- a/test/fixtures/flow/type-grouping/2/expected.json
+++ b/test/fixtures/flow/type-grouping/2/expected.json
@@ -12,10 +12,6 @@
       "column": 36
     }
   },
-  "range": [
-    0,
-    36
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 36
       }
     },
-    "range": [
-      0,
-      36
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 36
           }
         },
-        "range": [
-          0,
-          36
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 36
               }
             },
-            "range": [
-              4,
-              36
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 36
                 }
               },
-              "range": [
-                4,
-                36
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 36
                   }
                 },
-                "range": [
-                  5,
-                  36
-                ],
                 "typeAnnotation": {
                   "type": "UnionTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 36
                     }
                   },
-                  "range": [
-                    7,
-                    36
-                  ],
                   "types": [
                     {
                       "type": "FunctionTypeAnnotation",
@@ -143,10 +115,6 @@
                           "column": 20
                         }
                       },
-                      "range": [
-                        8,
-                        20
-                      ],
                       "params": [],
                       "rest": null,
                       "returnType": {
@@ -162,11 +130,7 @@
                             "line": 1,
                             "column": 20
                           }
-                        },
-                        "range": [
-                          14,
-                          20
-                        ]
+                        }
                       },
                       "typeParameters": null
                     },
@@ -184,10 +148,6 @@
                           "column": 36
                         }
                       },
-                      "range": [
-                        24,
-                        36
-                      ],
                       "params": [],
                       "rest": null,
                       "returnType": {
@@ -203,11 +163,7 @@
                             "line": 1,
                             "column": 36
                           }
-                        },
-                        "range": [
-                          30,
-                          36
-                        ]
+                        }
                       },
                       "typeParameters": null
                     }
@@ -221,5 +177,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-grouping/3/expected.json b/test/fixtures/flow/type-grouping/3/expected.json
index 1c08f05d96..a51a1dce92 100644
--- a/test/fixtures/flow/type-grouping/3/expected.json
+++ b/test/fixtures/flow/type-grouping/3/expected.json
@@ -12,10 +12,6 @@
       "column": 31
     }
   },
-  "range": [
-    0,
-    31
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 31
       }
     },
-    "range": [
-      0,
-      31
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 31
           }
         },
-        "range": [
-          0,
-          31
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 31
               }
             },
-            "range": [
-              4,
-              31
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 31
                 }
               },
-              "range": [
-                4,
-                31
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 31
                   }
                 },
-                "range": [
-                  5,
-                  31
-                ],
                 "typeAnnotation": {
                   "type": "IntersectionTypeAnnotation",
                   "start": 7,
@@ -124,10 +100,6 @@
                       "column": 31
                     }
                   },
-                  "range": [
-                    7,
-                    31
-                  ],
                   "types": [
                     {
                       "type": "NumberTypeAnnotation",
@@ -142,11 +114,7 @@
                           "line": 1,
                           "column": 13
                         }
-                      },
-                      "range": [
-                        7,
-                        13
-                      ]
+                      }
                     },
                     {
                       "type": "UnionTypeAnnotation",
@@ -162,10 +130,6 @@
                           "column": 30
                         }
                       },
-                      "range": [
-                        17,
-                        30
-                      ],
                       "types": [
                         {
                           "type": "StringTypeAnnotation",
@@ -180,11 +144,7 @@
                               "line": 1,
                               "column": 23
                             }
-                          },
-                          "range": [
-                            17,
-                            23
-                          ]
+                          }
                         },
                         {
                           "type": "BooleanTypeAnnotation",
@@ -199,11 +159,7 @@
                               "line": 1,
                               "column": 30
                             }
-                          },
-                          "range": [
-                            26,
-                            30
-                          ]
+                          }
                         }
                       ]
                     }
@@ -217,5 +173,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/type-grouping/4/expected.json b/test/fixtures/flow/type-grouping/4/expected.json
index 7689b316c2..3a2c2d5359 100644
--- a/test/fixtures/flow/type-grouping/4/expected.json
+++ b/test/fixtures/flow/type-grouping/4/expected.json
@@ -12,10 +12,6 @@
       "column": 17
     }
   },
-  "range": [
-    0,
-    17
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 17
       }
     },
-    "range": [
-      0,
-      17
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 17
           }
         },
-        "range": [
-          0,
-          17
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 17
               }
             },
-            "range": [
-              4,
-              17
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 17
                 }
               },
-              "range": [
-                4,
-                17
-              ],
               "name": "a",
               "typeAnnotation": {
                 "type": "TypeAnnotation",
@@ -106,10 +86,6 @@
                     "column": 17
                   }
                 },
-                "range": [
-                  5,
-                  17
-                ],
                 "typeAnnotation": {
                   "type": "TypeofTypeAnnotation",
                   "start": 8,
@@ -124,10 +100,6 @@
                       "column": 16
                     }
                   },
-                  "range": [
-                    8,
-                    16
-                  ],
                   "argument": {
                     "type": "GenericTypeAnnotation",
                     "start": 15,
@@ -142,10 +114,6 @@
                         "column": 16
                       }
                     },
-                    "range": [
-                      15,
-                      16
-                    ],
                     "typeParameters": null,
                     "id": {
                       "type": "Identifier",
@@ -161,10 +129,6 @@
                           "column": 16
                         }
                       },
-                      "range": [
-                        15,
-                        16
-                      ],
                       "name": "A"
                     }
                   }
@@ -177,5 +141,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/typecasts/1/expected.json b/test/fixtures/flow/typecasts/1/expected.json
index 26dc93af10..85939fde85 100644
--- a/test/fixtures/flow/typecasts/1/expected.json
+++ b/test/fixtures/flow/typecasts/1/expected.json
@@ -12,10 +12,6 @@
       "column": 13
     }
   },
-  "range": [
-    0,
-    13
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 13
       }
     },
-    "range": [
-      0,
-      13
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 13
           }
         },
-        "range": [
-          0,
-          13
-        ],
         "expression": {
           "type": "TypeCastExpression",
           "start": 1,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            1,
-            12
-          ],
           "expression": {
             "type": "Identifier",
             "start": 1,
@@ -86,10 +70,6 @@
                 "column": 4
               }
             },
-            "range": [
-              1,
-              4
-            ],
             "name": "xxx"
           },
           "typeAnnotation": {
@@ -106,10 +86,6 @@
                 "column": 12
               }
             },
-            "range": [
-              4,
-              12
-            ],
             "typeAnnotation": {
               "type": "NumberTypeAnnotation",
               "start": 6,
@@ -123,16 +99,13 @@
                   "line": 1,
                   "column": 12
                 }
-              },
-              "range": [
-                6,
-                12
-              ]
+              }
             }
           },
           "parenthesizedExpression": true
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/typecasts/2/expected.json b/test/fixtures/flow/typecasts/2/expected.json
index 0fff048e38..b703a717b9 100644
--- a/test/fixtures/flow/typecasts/2/expected.json
+++ b/test/fixtures/flow/typecasts/2/expected.json
@@ -12,10 +12,6 @@
       "column": 50
     }
   },
-  "range": [
-    0,
-    50
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 50
       }
     },
-    "range": [
-      0,
-      50
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 50
           }
         },
-        "range": [
-          0,
-          50
-        ],
         "expression": {
           "type": "TypeCastExpression",
           "start": 1,
@@ -68,10 +56,6 @@
               "column": 49
             }
           },
-          "range": [
-            1,
-            49
-          ],
           "expression": {
             "type": "ObjectExpression",
             "start": 1,
@@ -86,10 +70,6 @@
                 "column": 21
               }
             },
-            "range": [
-              1,
-              21
-            ],
             "properties": [
               {
                 "type": "Property",
@@ -105,10 +85,6 @@
                     "column": 8
                   }
                 },
-                "range": [
-                  2,
-                  8
-                ],
                 "method": false,
                 "shorthand": false,
                 "computed": false,
@@ -126,10 +102,6 @@
                       "column": 5
                     }
                   },
-                  "range": [
-                    2,
-                    5
-                  ],
                   "name": "xxx"
                 },
                 "value": {
@@ -146,10 +118,6 @@
                       "column": 8
                     }
                   },
-                  "range": [
-                    7,
-                    8
-                  ],
                   "value": 0,
                   "rawValue": 0,
                   "raw": "0"
@@ -170,10 +138,6 @@
                     "column": 20
                   }
                 },
-                "range": [
-                  10,
-                  20
-                ],
                 "method": false,
                 "shorthand": false,
                 "computed": false,
@@ -191,10 +155,6 @@
                       "column": 13
                     }
                   },
-                  "range": [
-                    10,
-                    13
-                  ],
                   "name": "yyy"
                 },
                 "value": {
@@ -211,10 +171,6 @@
                       "column": 20
                     }
                   },
-                  "range": [
-                    15,
-                    20
-                  ],
                   "value": "hey",
                   "rawValue": "hey",
                   "raw": "\"hey\""
@@ -237,10 +193,6 @@
                 "column": 49
               }
             },
-            "range": [
-              21,
-              49
-            ],
             "typeAnnotation": {
               "type": "ObjectTypeAnnotation",
               "start": 23,
@@ -255,10 +207,6 @@
                   "column": 49
                 }
               },
-              "range": [
-                23,
-                49
-              ],
               "callProperties": [],
               "properties": [
                 {
@@ -275,10 +223,6 @@
                       "column": 36
                     }
                   },
-                  "range": [
-                    24,
-                    36
-                  ],
                   "key": {
                     "type": "Identifier",
                     "start": 24,
@@ -293,10 +237,6 @@
                         "column": 27
                       }
                     },
-                    "range": [
-                      24,
-                      27
-                    ],
                     "name": "xxx"
                   },
                   "value": {
@@ -312,11 +252,7 @@
                         "line": 1,
                         "column": 35
                       }
-                    },
-                    "range": [
-                      29,
-                      35
-                    ]
+                    }
                   },
                   "optional": false
                 },
@@ -334,10 +270,6 @@
                       "column": 48
                     }
                   },
-                  "range": [
-                    37,
-                    48
-                  ],
                   "key": {
                     "type": "Identifier",
                     "start": 37,
@@ -352,10 +284,6 @@
                         "column": 40
                       }
                     },
-                    "range": [
-                      37,
-                      40
-                    ],
                     "name": "yyy"
                   },
                   "value": {
@@ -371,11 +299,7 @@
                         "line": 1,
                         "column": 48
                       }
-                    },
-                    "range": [
-                      42,
-                      48
-                    ]
+                    }
                   },
                   "optional": false
                 }
@@ -387,5 +311,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/typecasts/3/expected.json b/test/fixtures/flow/typecasts/3/expected.json
index 4e896c60db..6a5173baa1 100644
--- a/test/fixtures/flow/typecasts/3/expected.json
+++ b/test/fixtures/flow/typecasts/3/expected.json
@@ -12,10 +12,6 @@
       "column": 43
     }
   },
-  "range": [
-    0,
-    43
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 43
       }
     },
-    "range": [
-      0,
-      43
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 43
           }
         },
-        "range": [
-          0,
-          43
-        ],
         "expression": {
           "type": "TypeCastExpression",
           "start": 1,
@@ -68,10 +56,6 @@
               "column": 42
             }
           },
-          "range": [
-            1,
-            42
-          ],
           "expression": {
             "type": "ArrowFunctionExpression",
             "start": 1,
@@ -86,10 +70,6 @@
                 "column": 17
               }
             },
-            "range": [
-              1,
-              17
-            ],
             "id": null,
             "generator": false,
             "expression": true,
@@ -109,10 +89,6 @@
                     "column": 5
                   }
                 },
-                "range": [
-                  2,
-                  5
-                ],
                 "name": "xxx"
               }
             ],
@@ -130,10 +106,6 @@
                   "column": 17
                 }
               },
-              "range": [
-                10,
-                17
-              ],
               "left": {
                 "type": "Identifier",
                 "start": 10,
@@ -148,10 +120,6 @@
                     "column": 13
                   }
                 },
-                "range": [
-                  10,
-                  13
-                ],
                 "name": "xxx"
               },
               "operator": "+",
@@ -169,10 +137,6 @@
                     "column": 17
                   }
                 },
-                "range": [
-                  16,
-                  17
-                ],
                 "value": 1,
                 "rawValue": 1,
                 "raw": "1"
@@ -193,10 +157,6 @@
                 "column": 42
               }
             },
-            "range": [
-              17,
-              42
-            ],
             "typeAnnotation": {
               "type": "FunctionTypeAnnotation",
               "start": 19,
@@ -211,10 +171,6 @@
                   "column": 42
                 }
               },
-              "range": [
-                19,
-                42
-              ],
               "params": [
                 {
                   "type": "FunctionTypeParam",
@@ -230,10 +186,6 @@
                       "column": 31
                     }
                   },
-                  "range": [
-                    20,
-                    31
-                  ],
                   "name": {
                     "type": "Identifier",
                     "start": 20,
@@ -248,10 +200,6 @@
                         "column": 23
                       }
                     },
-                    "range": [
-                      20,
-                      23
-                    ],
                     "name": "xxx"
                   },
                   "optional": false,
@@ -268,11 +216,7 @@
                         "line": 1,
                         "column": 31
                       }
-                    },
-                    "range": [
-                      25,
-                      31
-                    ]
+                    }
                   }
                 }
               ],
@@ -290,11 +234,7 @@
                     "line": 1,
                     "column": 42
                   }
-                },
-                "range": [
-                  36,
-                  42
-                ]
+                }
               },
               "typeParameters": null
             }
@@ -303,5 +243,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/flow/typecasts/4/expected.json b/test/fixtures/flow/typecasts/4/expected.json
index 60fae4fb1e..2fd24c6b1d 100644
--- a/test/fixtures/flow/typecasts/4/expected.json
+++ b/test/fixtures/flow/typecasts/4/expected.json
@@ -12,10 +12,6 @@
       "column": 30
     }
   },
-  "range": [
-    0,
-    30
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 30
       }
     },
-    "range": [
-      0,
-      30
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 30
           }
         },
-        "range": [
-          0,
-          30
-        ],
         "expression": {
           "type": "SequenceExpression",
           "start": 1,
@@ -68,10 +56,6 @@
               "column": 29
             }
           },
-          "range": [
-            1,
-            29
-          ],
           "expressions": [
             {
               "type": "TypeCastExpression",
@@ -87,10 +71,6 @@
                   "column": 13
                 }
               },
-              "range": [
-                2,
-                13
-              ],
               "expression": {
                 "type": "Identifier",
                 "start": 2,
@@ -105,10 +85,6 @@
                     "column": 5
                   }
                 },
-                "range": [
-                  2,
-                  5
-                ],
                 "name": "xxx"
               },
               "typeAnnotation": {
@@ -125,10 +101,6 @@
                     "column": 13
                   }
                 },
-                "range": [
-                  5,
-                  13
-                ],
                 "typeAnnotation": {
                   "type": "NumberTypeAnnotation",
                   "start": 7,
@@ -142,11 +114,7 @@
                       "line": 1,
                       "column": 13
                     }
-                  },
-                  "range": [
-                    7,
-                    13
-                  ]
+                  }
                 }
               },
               "parenthesizedExpression": true
@@ -165,10 +133,6 @@
                   "column": 28
                 }
               },
-              "range": [
-                17,
-                28
-              ],
               "expression": {
                 "type": "Identifier",
                 "start": 17,
@@ -183,10 +147,6 @@
                     "column": 20
                   }
                 },
-                "range": [
-                  17,
-                  20
-                ],
                 "name": "yyy"
               },
               "typeAnnotation": {
@@ -203,10 +163,6 @@
                     "column": 28
                   }
                 },
-                "range": [
-                  20,
-                  28
-                ],
                 "typeAnnotation": {
                   "type": "StringTypeAnnotation",
                   "start": 22,
@@ -220,11 +176,7 @@
                       "line": 1,
                       "column": 28
                     }
-                  },
-                  "range": [
-                    22,
-                    28
-                  ]
+                  }
                 }
               },
               "parenthesizedExpression": true
@@ -234,5 +186,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/1/expected.json b/test/fixtures/harmony/uncategorised/1/expected.json
index c92341aa33..a9ae440c03 100644
--- a/test/fixtures/harmony/uncategorised/1/expected.json
+++ b/test/fixtures/harmony/uncategorised/1/expected.json
@@ -12,10 +12,6 @@
       "column": 18
     }
   },
-  "range": [
-    0,
-    18
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 18
       }
     },
-    "range": [
-      0,
-      18
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 18
           }
         },
-        "range": [
-          0,
-          18
-        ],
         "expression": {
           "type": "Literal",
           "start": 0,
@@ -68,15 +56,12 @@
               "column": 18
             }
           },
-          "range": [
-            0,
-            18
-          ],
           "value": "煎茶",
           "rawValue": "煎茶",
           "raw": "\"\\u{714E}\\u{8336}\""
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/10/expected.json b/test/fixtures/harmony/uncategorised/10/expected.json
index 55afcf63af..cf7579fc2b 100644
--- a/test/fixtures/harmony/uncategorised/10/expected.json
+++ b/test/fixtures/harmony/uncategorised/10/expected.json
@@ -12,10 +12,6 @@
       "column": 3
     }
   },
-  "range": [
-    0,
-    3
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 3
       }
     },
-    "range": [
-      0,
-      3
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 3
           }
         },
-        "range": [
-          0,
-          3
-        ],
         "expression": {
           "type": "Literal",
           "start": 0,
@@ -68,15 +56,12 @@
               "column": 3
             }
           },
-          "range": [
-            0,
-            3
-          ],
           "value": 2,
           "rawValue": 2,
           "raw": "0O2"
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/100/expected.json b/test/fixtures/harmony/uncategorised/100/expected.json
index c53461d3b3..666ce9a5b4 100644
--- a/test/fixtures/harmony/uncategorised/100/expected.json
+++ b/test/fixtures/harmony/uncategorised/100/expected.json
@@ -12,10 +12,6 @@
       "column": 4
     }
   },
-  "range": [
-    0,
-    26
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 4
       }
     },
-    "range": [
-      0,
-      26
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 4
           }
         },
-        "range": [
-          0,
-          26
-        ],
         "expression": {
           "type": "FunctionExpression",
           "start": 1,
@@ -68,10 +56,6 @@
               "column": 3
             }
           },
-          "range": [
-            1,
-            25
-          ],
           "id": null,
           "generator": true,
           "expression": false,
@@ -90,10 +74,6 @@
                 "column": 3
               }
             },
-            "range": [
-              14,
-              25
-            ],
             "body": [
               {
                 "type": "ExpressionStatement",
@@ -109,10 +89,6 @@
                     "column": 21
                   }
                 },
-                "range": [
-                  16,
-                  21
-                ],
                 "expression": {
                   "type": "YieldExpression",
                   "start": 16,
@@ -127,10 +103,6 @@
                       "column": 21
                     }
                   },
-                  "range": [
-                    16,
-                    21
-                  ],
                   "delegate": false,
                   "argument": null
                 }
@@ -149,10 +121,6 @@
                     "column": 1
                   }
                 },
-                "range": [
-                  22,
-                  23
-                ],
                 "expression": {
                   "type": "Identifier",
                   "start": 22,
@@ -167,10 +135,6 @@
                       "column": 1
                     }
                   },
-                  "range": [
-                    22,
-                    23
-                  ],
                   "name": "v"
                 }
               }
@@ -180,5 +144,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/101/expected.json b/test/fixtures/harmony/uncategorised/101/expected.json
index a037f50d2d..2567fa978a 100644
--- a/test/fixtures/harmony/uncategorised/101/expected.json
+++ b/test/fixtures/harmony/uncategorised/101/expected.json
@@ -12,10 +12,6 @@
       "column": 27
     }
   },
-  "range": [
-    0,
-    27
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 27
       }
     },
-    "range": [
-      0,
-      27
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 27
           }
         },
-        "range": [
-          0,
-          27
-        ],
         "expression": {
           "type": "FunctionExpression",
           "start": 1,
@@ -68,10 +56,6 @@
               "column": 26
             }
           },
-          "range": [
-            1,
-            26
-          ],
           "id": null,
           "generator": true,
           "expression": false,
@@ -90,10 +74,6 @@
                 "column": 26
               }
             },
-            "range": [
-              14,
-              26
-            ],
             "body": [
               {
                 "type": "ExpressionStatement",
@@ -109,10 +89,6 @@
                     "column": 24
                   }
                 },
-                "range": [
-                  16,
-                  24
-                ],
                 "expression": {
                   "type": "YieldExpression",
                   "start": 16,
@@ -127,10 +103,6 @@
                       "column": 24
                     }
                   },
-                  "range": [
-                    16,
-                    24
-                  ],
                   "delegate": true,
                   "argument": {
                     "type": "Identifier",
@@ -146,10 +118,6 @@
                         "column": 24
                       }
                     },
-                    "range": [
-                      23,
-                      24
-                    ],
                     "name": "v"
                   }
                 }
@@ -160,5 +128,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/102/expected.json b/test/fixtures/harmony/uncategorised/102/expected.json
index 36adf7460f..313a50f769 100644
--- a/test/fixtures/harmony/uncategorised/102/expected.json
+++ b/test/fixtures/harmony/uncategorised/102/expected.json
@@ -12,10 +12,6 @@
       "column": 30
     }
   },
-  "range": [
-    0,
-    30
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 30
       }
     },
-    "range": [
-      0,
-      30
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 30
           }
         },
-        "range": [
-          0,
-          30
-        ],
         "id": {
           "type": "Identifier",
           "start": 10,
@@ -68,10 +56,6 @@
               "column": 14
             }
           },
-          "range": [
-            10,
-            14
-          ],
           "name": "test"
         },
         "generator": true,
@@ -91,10 +75,6 @@
               "column": 30
             }
           },
-          "range": [
-            18,
-            30
-          ],
           "body": [
             {
               "type": "ExpressionStatement",
@@ -110,10 +90,6 @@
                   "column": 28
                 }
               },
-              "range": [
-                20,
-                28
-              ],
               "expression": {
                 "type": "YieldExpression",
                 "start": 20,
@@ -128,10 +104,6 @@
                     "column": 28
                   }
                 },
-                "range": [
-                  20,
-                  28
-                ],
                 "delegate": true,
                 "argument": {
                   "type": "Identifier",
@@ -147,10 +119,6 @@
                       "column": 28
                     }
                   },
-                  "range": [
-                    27,
-                    28
-                  ],
                   "name": "v"
                 }
               }
@@ -159,5 +127,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/103/expected.json b/test/fixtures/harmony/uncategorised/103/expected.json
index d7c678b756..609ce0d37a 100644
--- a/test/fixtures/harmony/uncategorised/103/expected.json
+++ b/test/fixtures/harmony/uncategorised/103/expected.json
@@ -12,10 +12,6 @@
       "column": 34
     }
   },
-  "range": [
-    0,
-    34
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 34
       }
     },
-    "range": [
-      0,
-      34
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 34
           }
         },
-        "range": [
-          0,
-          34
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 33
               }
             },
-            "range": [
-              4,
-              33
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 5
                 }
               },
-              "range": [
-                4,
-                5
-              ],
               "name": "x"
             },
             "init": {
@@ -107,10 +87,6 @@
                   "column": 33
                 }
               },
-              "range": [
-                8,
-                33
-              ],
               "properties": [
                 {
                   "type": "Property",
@@ -126,10 +102,6 @@
                       "column": 31
                     }
                   },
-                  "range": [
-                    10,
-                    31
-                  ],
                   "method": true,
                   "shorthand": false,
                   "computed": false,
@@ -147,10 +119,6 @@
                         "column": 15
                       }
                     },
-                    "range": [
-                      11,
-                      15
-                    ],
                     "name": "test"
                   },
                   "kind": "init",
@@ -168,10 +136,6 @@
                         "column": 31
                       }
                     },
-                    "range": [
-                      16,
-                      31
-                    ],
                     "id": null,
                     "generator": true,
                     "expression": false,
@@ -190,10 +154,6 @@
                           "column": 31
                         }
                       },
-                      "range": [
-                        19,
-                        31
-                      ],
                       "body": [
                         {
                           "type": "ExpressionStatement",
@@ -209,10 +169,6 @@
                               "column": 29
                             }
                           },
-                          "range": [
-                            21,
-                            29
-                          ],
                           "expression": {
                             "type": "YieldExpression",
                             "start": 21,
@@ -227,10 +183,6 @@
                                 "column": 29
                               }
                             },
-                            "range": [
-                              21,
-                              29
-                            ],
                             "delegate": true,
                             "argument": {
                               "type": "Identifier",
@@ -246,10 +198,6 @@
                                   "column": 29
                                 }
                               },
-                              "range": [
-                                28,
-                                29
-                              ],
                               "name": "v"
                             }
                           }
@@ -265,5 +213,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/105/expected.json b/test/fixtures/harmony/uncategorised/105/expected.json
index 8fb310f4db..cf48cd61b8 100644
--- a/test/fixtures/harmony/uncategorised/105/expected.json
+++ b/test/fixtures/harmony/uncategorised/105/expected.json
@@ -12,10 +12,6 @@
       "column": 16
     }
   },
-  "range": [
-    0,
-    16
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 16
       }
     },
-    "range": [
-      0,
-      16
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 16
           }
         },
-        "range": [
-          0,
-          16
-        ],
         "id": {
           "type": "Identifier",
           "start": 10,
@@ -68,10 +56,6 @@
               "column": 11
             }
           },
-          "range": [
-            10,
-            11
-          ],
           "name": "t"
         },
         "generator": true,
@@ -91,13 +75,10 @@
               "column": 16
             }
           },
-          "range": [
-            14,
-            16
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/106/expected.json b/test/fixtures/harmony/uncategorised/106/expected.json
index 9d5385660b..2bbbe1257e 100644
--- a/test/fixtures/harmony/uncategorised/106/expected.json
+++ b/test/fixtures/harmony/uncategorised/106/expected.json
@@ -12,10 +12,6 @@
       "column": 33
     }
   },
-  "range": [
-    0,
-    33
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 33
       }
     },
-    "range": [
-      0,
-      33
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 33
           }
         },
-        "range": [
-          0,
-          33
-        ],
         "expression": {
           "type": "FunctionExpression",
           "start": 1,
@@ -68,10 +56,6 @@
               "column": 32
             }
           },
-          "range": [
-            1,
-            32
-          ],
           "id": null,
           "generator": true,
           "expression": false,
@@ -90,10 +74,6 @@
                 "column": 32
               }
             },
-            "range": [
-              14,
-              32
-            ],
             "body": [
               {
                 "type": "ExpressionStatement",
@@ -109,10 +89,6 @@
                     "column": 30
                   }
                 },
-                "range": [
-                  16,
-                  30
-                ],
                 "expression": {
                   "type": "YieldExpression",
                   "start": 16,
@@ -127,10 +103,6 @@
                       "column": 30
                     }
                   },
-                  "range": [
-                    16,
-                    30
-                  ],
                   "delegate": false,
                   "argument": {
                     "type": "YieldExpression",
@@ -146,10 +118,6 @@
                         "column": 30
                       }
                     },
-                    "range": [
-                      22,
-                      30
-                    ],
                     "delegate": false,
                     "argument": {
                       "type": "Literal",
@@ -165,10 +133,6 @@
                           "column": 30
                         }
                       },
-                      "range": [
-                        28,
-                        30
-                      ],
                       "value": 10,
                       "rawValue": 10,
                       "raw": "10"
@@ -182,5 +146,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/107/expected.json b/test/fixtures/harmony/uncategorised/107/expected.json
index a47e72d406..0b5fab146f 100644
--- a/test/fixtures/harmony/uncategorised/107/expected.json
+++ b/test/fixtures/harmony/uncategorised/107/expected.json
@@ -12,10 +12,6 @@
       "column": 26
     }
   },
-  "range": [
-    0,
-    26
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 26
       }
     },
-    "range": [
-      0,
-      26
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 26
           }
         },
-        "range": [
-          0,
-          26
-        ],
         "left": {
           "type": "Identifier",
           "start": 4,
@@ -68,10 +56,6 @@
               "column": 5
             }
           },
-          "range": [
-            4,
-            5
-          ],
           "name": "x"
         },
         "right": {
@@ -88,10 +72,6 @@
               "column": 13
             }
           },
-          "range": [
-            9,
-            13
-          ],
           "name": "list"
         },
         "body": {
@@ -108,10 +88,6 @@
               "column": 26
             }
           },
-          "range": [
-            15,
-            26
-          ],
           "expression": {
             "type": "CallExpression",
             "start": 15,
@@ -126,10 +102,6 @@
                 "column": 25
               }
             },
-            "range": [
-              15,
-              25
-            ],
             "callee": {
               "type": "Identifier",
               "start": 15,
@@ -144,10 +116,6 @@
                   "column": 22
                 }
               },
-              "range": [
-                15,
-                22
-              ],
               "name": "process"
             },
             "arguments": [
@@ -165,10 +133,6 @@
                     "column": 24
                   }
                 },
-                "range": [
-                  23,
-                  24
-                ],
                 "name": "x"
               }
             ]
@@ -176,5 +140,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/108/expected.json b/test/fixtures/harmony/uncategorised/108/expected.json
index 75c71c2b1d..135f7e34c7 100644
--- a/test/fixtures/harmony/uncategorised/108/expected.json
+++ b/test/fixtures/harmony/uncategorised/108/expected.json
@@ -12,10 +12,6 @@
       "column": 31
     }
   },
-  "range": [
-    0,
-    31
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 31
       }
     },
-    "range": [
-      0,
-      31
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 31
           }
         },
-        "range": [
-          0,
-          31
-        ],
         "left": {
           "type": "VariableDeclaration",
           "start": 5,
@@ -68,10 +56,6 @@
               "column": 10
             }
           },
-          "range": [
-            5,
-            10
-          ],
           "declarations": [
             {
               "type": "VariableDeclarator",
@@ -87,10 +71,6 @@
                   "column": 10
                 }
               },
-              "range": [
-                9,
-                10
-              ],
               "id": {
                 "type": "Identifier",
                 "start": 9,
@@ -105,10 +85,6 @@
                     "column": 10
                   }
                 },
-                "range": [
-                  9,
-                  10
-                ],
                 "name": "x"
               },
               "init": null
@@ -130,10 +106,6 @@
               "column": 18
             }
           },
-          "range": [
-            14,
-            18
-          ],
           "name": "list"
         },
         "body": {
@@ -150,10 +122,6 @@
               "column": 31
             }
           },
-          "range": [
-            20,
-            31
-          ],
           "expression": {
             "type": "CallExpression",
             "start": 20,
@@ -168,10 +136,6 @@
                 "column": 30
               }
             },
-            "range": [
-              20,
-              30
-            ],
             "callee": {
               "type": "Identifier",
               "start": 20,
@@ -186,10 +150,6 @@
                   "column": 27
                 }
               },
-              "range": [
-                20,
-                27
-              ],
               "name": "process"
             },
             "arguments": [
@@ -207,10 +167,6 @@
                     "column": 29
                   }
                 },
-                "range": [
-                  28,
-                  29
-                ],
                 "name": "x"
               }
             ]
@@ -218,5 +174,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/109/expected.json b/test/fixtures/harmony/uncategorised/109/expected.json
index 65c6068088..5d28065a98 100644
--- a/test/fixtures/harmony/uncategorised/109/expected.json
+++ b/test/fixtures/harmony/uncategorised/109/expected.json
@@ -12,10 +12,6 @@
       "column": 36
     }
   },
-  "range": [
-    0,
-    36
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 36
       }
     },
-    "range": [
-      0,
-      36
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 36
           }
         },
-        "range": [
-          0,
-          36
-        ],
         "left": {
           "type": "VariableDeclaration",
           "start": 5,
@@ -68,10 +56,6 @@
               "column": 15
             }
           },
-          "range": [
-            5,
-            15
-          ],
           "declarations": [
             {
               "type": "VariableDeclarator",
@@ -87,10 +71,6 @@
                   "column": 15
                 }
               },
-              "range": [
-                9,
-                15
-              ],
               "id": {
                 "type": "Identifier",
                 "start": 9,
@@ -105,10 +85,6 @@
                     "column": 10
                   }
                 },
-                "range": [
-                  9,
-                  10
-                ],
                 "name": "x"
               },
               "init": {
@@ -125,10 +101,6 @@
                     "column": 15
                   }
                 },
-                "range": [
-                  13,
-                  15
-                ],
                 "value": 42,
                 "rawValue": 42,
                 "raw": "42"
@@ -151,10 +123,6 @@
               "column": 23
             }
           },
-          "range": [
-            19,
-            23
-          ],
           "name": "list"
         },
         "body": {
@@ -171,10 +139,6 @@
               "column": 36
             }
           },
-          "range": [
-            25,
-            36
-          ],
           "expression": {
             "type": "CallExpression",
             "start": 25,
@@ -189,10 +153,6 @@
                 "column": 35
               }
             },
-            "range": [
-              25,
-              35
-            ],
             "callee": {
               "type": "Identifier",
               "start": 25,
@@ -207,10 +167,6 @@
                   "column": 32
                 }
               },
-              "range": [
-                25,
-                32
-              ],
               "name": "process"
             },
             "arguments": [
@@ -228,10 +184,6 @@
                     "column": 34
                   }
                 },
-                "range": [
-                  33,
-                  34
-                ],
                 "name": "x"
               }
             ]
@@ -239,5 +191,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/11/expected.json b/test/fixtures/harmony/uncategorised/11/expected.json
index 4812e74c0c..a6833d9df8 100644
--- a/test/fixtures/harmony/uncategorised/11/expected.json
+++ b/test/fixtures/harmony/uncategorised/11/expected.json
@@ -12,10 +12,6 @@
       "column": 4
     }
   },
-  "range": [
-    0,
-    4
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 4
       }
     },
-    "range": [
-      0,
-      4
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 4
           }
         },
-        "range": [
-          0,
-          4
-        ],
         "expression": {
           "type": "Literal",
           "start": 0,
@@ -68,15 +56,12 @@
               "column": 4
             }
           },
-          "range": [
-            0,
-            4
-          ],
           "value": 10,
           "rawValue": 10,
           "raw": "0O12"
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/110/expected.json b/test/fixtures/harmony/uncategorised/110/expected.json
index 3a96e94ee4..121d7f9753 100644
--- a/test/fixtures/harmony/uncategorised/110/expected.json
+++ b/test/fixtures/harmony/uncategorised/110/expected.json
@@ -12,10 +12,6 @@
       "column": 31
     }
   },
-  "range": [
-    0,
-    31
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 31
       }
     },
-    "range": [
-      0,
-      31
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 31
           }
         },
-        "range": [
-          0,
-          31
-        ],
         "left": {
           "type": "VariableDeclaration",
           "start": 5,
@@ -68,10 +56,6 @@
               "column": 10
             }
           },
-          "range": [
-            5,
-            10
-          ],
           "declarations": [
             {
               "type": "VariableDeclarator",
@@ -87,10 +71,6 @@
                   "column": 10
                 }
               },
-              "range": [
-                9,
-                10
-              ],
               "id": {
                 "type": "Identifier",
                 "start": 9,
@@ -105,10 +85,6 @@
                     "column": 10
                   }
                 },
-                "range": [
-                  9,
-                  10
-                ],
                 "name": "x"
               },
               "init": null
@@ -130,10 +106,6 @@
               "column": 18
             }
           },
-          "range": [
-            14,
-            18
-          ],
           "name": "list"
         },
         "body": {
@@ -150,10 +122,6 @@
               "column": 31
             }
           },
-          "range": [
-            20,
-            31
-          ],
           "expression": {
             "type": "CallExpression",
             "start": 20,
@@ -168,10 +136,6 @@
                 "column": 30
               }
             },
-            "range": [
-              20,
-              30
-            ],
             "callee": {
               "type": "Identifier",
               "start": 20,
@@ -186,10 +150,6 @@
                   "column": 27
                 }
               },
-              "range": [
-                20,
-                27
-              ],
               "name": "process"
             },
             "arguments": [
@@ -207,10 +167,6 @@
                     "column": 29
                   }
                 },
-                "range": [
-                  28,
-                  29
-                ],
                 "name": "x"
               }
             ]
@@ -218,5 +174,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/111/expected.json b/test/fixtures/harmony/uncategorised/111/expected.json
index 2b37a831c6..4f7aa5c5a4 100644
--- a/test/fixtures/harmony/uncategorised/111/expected.json
+++ b/test/fixtures/harmony/uncategorised/111/expected.json
@@ -12,10 +12,6 @@
       "column": 26
     }
   },
-  "range": [
-    0,
-    26
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 26
       }
     },
-    "range": [
-      0,
-      26
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 26
           }
         },
-        "range": [
-          0,
-          26
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 26
               }
             },
-            "range": [
-              4,
-              26
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 5
                 }
               },
-              "range": [
-                4,
-                5
-              ],
               "name": "A"
             },
             "init": {
@@ -107,10 +87,6 @@
                   "column": 26
                 }
               },
-              "range": [
-                8,
-                26
-              ],
               "id": null,
               "superClass": {
                 "type": "Identifier",
@@ -126,10 +102,6 @@
                     "column": 23
                   }
                 },
-                "range": [
-                  22,
-                  23
-                ],
                 "name": "B"
               },
               "body": {
@@ -146,10 +118,6 @@
                     "column": 26
                   }
                 },
-                "range": [
-                  24,
-                  26
-                ],
                 "body": []
               }
             }
@@ -158,5 +126,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/112/expected.json b/test/fixtures/harmony/uncategorised/112/expected.json
index 83b27df7b9..0a8f8339c4 100644
--- a/test/fixtures/harmony/uncategorised/112/expected.json
+++ b/test/fixtures/harmony/uncategorised/112/expected.json
@@ -12,10 +12,6 @@
       "column": 39
     }
   },
-  "range": [
-    0,
-    39
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 39
       }
     },
-    "range": [
-      0,
-      39
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 39
           }
         },
-        "range": [
-          0,
-          39
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 7
             }
           },
-          "range": [
-            6,
-            7
-          ],
           "name": "A"
         },
         "superClass": {
@@ -88,10 +72,6 @@
               "column": 36
             }
           },
-          "range": [
-            16,
-            36
-          ],
           "id": {
             "type": "Identifier",
             "start": 22,
@@ -106,10 +86,6 @@
                 "column": 23
               }
             },
-            "range": [
-              22,
-              23
-            ],
             "name": "B"
           },
           "superClass": {
@@ -126,10 +102,6 @@
                 "column": 33
               }
             },
-            "range": [
-              32,
-              33
-            ],
             "name": "C"
           },
           "body": {
@@ -146,10 +118,6 @@
                 "column": 36
               }
             },
-            "range": [
-              34,
-              36
-            ],
             "body": []
           }
         },
@@ -167,13 +135,10 @@
               "column": 39
             }
           },
-          "range": [
-            37,
-            39
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/113/expected.json b/test/fixtures/harmony/uncategorised/113/expected.json
index 927c25bab8..937612426b 100644
--- a/test/fixtures/harmony/uncategorised/113/expected.json
+++ b/test/fixtures/harmony/uncategorised/113/expected.json
@@ -12,10 +12,6 @@
       "column": 18
     }
   },
-  "range": [
-    0,
-    18
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 18
       }
     },
-    "range": [
-      0,
-      18
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 18
           }
         },
-        "range": [
-          0,
-          18
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 7
             }
           },
-          "range": [
-            6,
-            7
-          ],
           "name": "A"
         },
         "superClass": null,
@@ -89,10 +73,6 @@
               "column": 18
             }
           },
-          "range": [
-            8,
-            18
-          ],
           "body": [
             {
               "type": "MethodDefinition",
@@ -108,10 +88,6 @@
                   "column": 17
                 }
               },
-              "range": [
-                9,
-                17
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -127,10 +103,6 @@
                     "column": 12
                   }
                 },
-                "range": [
-                  9,
-                  12
-                ],
                 "name": "get"
               },
               "static": false,
@@ -149,10 +121,6 @@
                     "column": 17
                   }
                 },
-                "range": [
-                  12,
-                  17
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -171,10 +139,6 @@
                       "column": 17
                     }
                   },
-                  "range": [
-                    15,
-                    17
-                  ],
                   "body": []
                 }
               }
@@ -183,5 +147,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/114/expected.json b/test/fixtures/harmony/uncategorised/114/expected.json
index 88cadea1a3..2161c2d0ee 100644
--- a/test/fixtures/harmony/uncategorised/114/expected.json
+++ b/test/fixtures/harmony/uncategorised/114/expected.json
@@ -12,10 +12,6 @@
       "column": 26
     }
   },
-  "range": [
-    0,
-    26
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 26
       }
     },
-    "range": [
-      0,
-      26
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 26
           }
         },
-        "range": [
-          0,
-          26
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 7
             }
           },
-          "range": [
-            6,
-            7
-          ],
           "name": "A"
         },
         "superClass": null,
@@ -89,10 +73,6 @@
               "column": 26
             }
           },
-          "range": [
-            8,
-            26
-          ],
           "body": [
             {
               "type": "MethodDefinition",
@@ -108,10 +88,6 @@
                   "column": 25
                 }
               },
-              "range": [
-                10,
-                25
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -127,10 +103,6 @@
                     "column": 20
                   }
                 },
-                "range": [
-                  17,
-                  20
-                ],
                 "name": "get"
               },
               "static": true,
@@ -149,10 +121,6 @@
                     "column": 25
                   }
                 },
-                "range": [
-                  20,
-                  25
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -171,10 +139,6 @@
                       "column": 25
                     }
                   },
-                  "range": [
-                    23,
-                    25
-                  ],
                   "body": []
                 }
               }
@@ -183,5 +147,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/115/expected.json b/test/fixtures/harmony/uncategorised/115/expected.json
index 2e168b4488..9b6a05da2a 100644
--- a/test/fixtures/harmony/uncategorised/115/expected.json
+++ b/test/fixtures/harmony/uncategorised/115/expected.json
@@ -12,10 +12,6 @@
       "column": 32
     }
   },
-  "range": [
-    0,
-    32
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 32
       }
     },
-    "range": [
-      0,
-      32
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 32
           }
         },
-        "range": [
-          0,
-          32
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 7
             }
           },
-          "range": [
-            6,
-            7
-          ],
           "name": "A"
         },
         "superClass": {
@@ -88,10 +72,6 @@
               "column": 17
             }
           },
-          "range": [
-            16,
-            17
-          ],
           "name": "B"
         },
         "body": {
@@ -108,10 +88,6 @@
               "column": 32
             }
           },
-          "range": [
-            18,
-            32
-          ],
           "body": [
             {
               "type": "MethodDefinition",
@@ -127,10 +103,6 @@
                   "column": 31
                 }
               },
-              "range": [
-                19,
-                31
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -146,10 +118,6 @@
                     "column": 26
                   }
                 },
-                "range": [
-                  23,
-                  26
-                ],
                 "name": "foo"
               },
               "static": false,
@@ -168,10 +136,6 @@
                     "column": 31
                   }
                 },
-                "range": [
-                  26,
-                  31
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -190,10 +154,6 @@
                       "column": 31
                     }
                   },
-                  "range": [
-                    29,
-                    31
-                  ],
                   "body": []
                 }
               }
@@ -202,5 +162,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/116/expected.json b/test/fixtures/harmony/uncategorised/116/expected.json
index 130f2d6d28..787e636554 100644
--- a/test/fixtures/harmony/uncategorised/116/expected.json
+++ b/test/fixtures/harmony/uncategorised/116/expected.json
@@ -12,10 +12,6 @@
       "column": 40
     }
   },
-  "range": [
-    0,
-    40
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 40
       }
     },
-    "range": [
-      0,
-      40
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 40
           }
         },
-        "range": [
-          0,
-          40
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 7
             }
           },
-          "range": [
-            6,
-            7
-          ],
           "name": "A"
         },
         "superClass": {
@@ -88,10 +72,6 @@
               "column": 17
             }
           },
-          "range": [
-            16,
-            17
-          ],
           "name": "B"
         },
         "body": {
@@ -108,10 +88,6 @@
               "column": 40
             }
           },
-          "range": [
-            18,
-            40
-          ],
           "body": [
             {
               "type": "MethodDefinition",
@@ -127,10 +103,6 @@
                   "column": 39
                 }
               },
-              "range": [
-                20,
-                39
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -146,10 +118,6 @@
                     "column": 34
                   }
                 },
-                "range": [
-                  31,
-                  34
-                ],
                 "name": "foo"
               },
               "static": true,
@@ -168,10 +136,6 @@
                     "column": 39
                   }
                 },
-                "range": [
-                  34,
-                  39
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -190,10 +154,6 @@
                       "column": 39
                     }
                   },
-                  "range": [
-                    37,
-                    39
-                  ],
                   "body": []
                 }
               }
@@ -202,5 +162,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/117/expected.json b/test/fixtures/harmony/uncategorised/117/expected.json
index 788769feea..0a4f8836f9 100644
--- a/test/fixtures/harmony/uncategorised/117/expected.json
+++ b/test/fixtures/harmony/uncategorised/117/expected.json
@@ -12,10 +12,6 @@
       "column": 21
     }
   },
-  "range": [
-    0,
-    21
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 21
       }
     },
-    "range": [
-      0,
-      21
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 21
           }
         },
-        "range": [
-          0,
-          21
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 7
             }
           },
-          "range": [
-            6,
-            7
-          ],
           "name": "A"
         },
         "superClass": null,
@@ -89,10 +73,6 @@
               "column": 21
             }
           },
-          "range": [
-            8,
-            21
-          ],
           "body": [
             {
               "type": "MethodDefinition",
@@ -108,10 +88,6 @@
                   "column": 20
                 }
               },
-              "range": [
-                9,
-                20
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -127,10 +103,6 @@
                     "column": 14
                   }
                 },
-                "range": [
-                  13,
-                  14
-                ],
                 "name": "a"
               },
               "static": false,
@@ -149,10 +121,6 @@
                     "column": 20
                   }
                 },
-                "range": [
-                  14,
-                  20
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -171,10 +139,6 @@
                         "column": 16
                       }
                     },
-                    "range": [
-                      15,
-                      16
-                    ],
                     "name": "v"
                   }
                 ],
@@ -192,10 +156,6 @@
                       "column": 20
                     }
                   },
-                  "range": [
-                    18,
-                    20
-                  ],
                   "body": []
                 }
               }
@@ -204,5 +164,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/118/expected.json b/test/fixtures/harmony/uncategorised/118/expected.json
index ac784b3fe7..58a55c8a4c 100644
--- a/test/fixtures/harmony/uncategorised/118/expected.json
+++ b/test/fixtures/harmony/uncategorised/118/expected.json
@@ -12,10 +12,6 @@
       "column": 29
     }
   },
-  "range": [
-    0,
-    29
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 29
       }
     },
-    "range": [
-      0,
-      29
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 29
           }
         },
-        "range": [
-          0,
-          29
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 7
             }
           },
-          "range": [
-            6,
-            7
-          ],
           "name": "A"
         },
         "superClass": null,
@@ -89,10 +73,6 @@
               "column": 29
             }
           },
-          "range": [
-            8,
-            29
-          ],
           "body": [
             {
               "type": "MethodDefinition",
@@ -108,10 +88,6 @@
                   "column": 28
                 }
               },
-              "range": [
-                10,
-                28
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -127,10 +103,6 @@
                     "column": 22
                   }
                 },
-                "range": [
-                  21,
-                  22
-                ],
                 "name": "a"
               },
               "static": true,
@@ -149,10 +121,6 @@
                     "column": 28
                   }
                 },
-                "range": [
-                  22,
-                  28
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -171,10 +139,6 @@
                         "column": 24
                       }
                     },
-                    "range": [
-                      23,
-                      24
-                    ],
                     "name": "v"
                   }
                 ],
@@ -192,10 +156,6 @@
                       "column": 28
                     }
                   },
-                  "range": [
-                    26,
-                    28
-                  ],
                   "body": []
                 }
               }
@@ -204,5 +164,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/119/expected.json b/test/fixtures/harmony/uncategorised/119/expected.json
index 2a17a61889..e8659d9d1a 100644
--- a/test/fixtures/harmony/uncategorised/119/expected.json
+++ b/test/fixtures/harmony/uncategorised/119/expected.json
@@ -12,10 +12,6 @@
       "column": 20
     }
   },
-  "range": [
-    0,
-    20
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 20
       }
     },
-    "range": [
-      0,
-      20
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 20
           }
         },
-        "range": [
-          0,
-          20
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 7
             }
           },
-          "range": [
-            6,
-            7
-          ],
           "name": "A"
         },
         "superClass": null,
@@ -89,10 +73,6 @@
               "column": 20
             }
           },
-          "range": [
-            8,
-            20
-          ],
           "body": [
             {
               "type": "MethodDefinition",
@@ -108,10 +88,6 @@
                   "column": 18
                 }
               },
-              "range": [
-                9,
-                18
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -127,10 +103,6 @@
                     "column": 12
                   }
                 },
-                "range": [
-                  9,
-                  12
-                ],
                 "name": "set"
               },
               "static": false,
@@ -149,10 +121,6 @@
                     "column": 18
                   }
                 },
-                "range": [
-                  12,
-                  18
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -171,10 +139,6 @@
                         "column": 14
                       }
                     },
-                    "range": [
-                      13,
-                      14
-                    ],
                     "name": "v"
                   }
                 ],
@@ -192,10 +156,6 @@
                       "column": 18
                     }
                   },
-                  "range": [
-                    16,
-                    18
-                  ],
                   "body": []
                 }
               }
@@ -204,5 +164,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/12/expected.json b/test/fixtures/harmony/uncategorised/12/expected.json
index d2d04221dd..eaf92df189 100644
--- a/test/fixtures/harmony/uncategorised/12/expected.json
+++ b/test/fixtures/harmony/uncategorised/12/expected.json
@@ -12,10 +12,6 @@
       "column": 3
     }
   },
-  "range": [
-    0,
-    3
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 3
       }
     },
-    "range": [
-      0,
-      3
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 3
           }
         },
-        "range": [
-          0,
-          3
-        ],
         "expression": {
           "type": "Literal",
           "start": 0,
@@ -68,15 +56,12 @@
               "column": 3
             }
           },
-          "range": [
-            0,
-            3
-          ],
           "value": 0,
           "rawValue": 0,
           "raw": "0b0"
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/120/expected.json b/test/fixtures/harmony/uncategorised/120/expected.json
index 919b4201a2..4cbc7e1ce5 100644
--- a/test/fixtures/harmony/uncategorised/120/expected.json
+++ b/test/fixtures/harmony/uncategorised/120/expected.json
@@ -12,10 +12,6 @@
       "column": 28
     }
   },
-  "range": [
-    0,
-    28
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 28
       }
     },
-    "range": [
-      0,
-      28
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 28
           }
         },
-        "range": [
-          0,
-          28
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 7
             }
           },
-          "range": [
-            6,
-            7
-          ],
           "name": "A"
         },
         "superClass": null,
@@ -89,10 +73,6 @@
               "column": 28
             }
           },
-          "range": [
-            8,
-            28
-          ],
           "body": [
             {
               "type": "MethodDefinition",
@@ -108,10 +88,6 @@
                   "column": 26
                 }
               },
-              "range": [
-                10,
-                26
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -127,10 +103,6 @@
                     "column": 20
                   }
                 },
-                "range": [
-                  17,
-                  20
-                ],
                 "name": "set"
               },
               "static": true,
@@ -149,10 +121,6 @@
                     "column": 26
                   }
                 },
-                "range": [
-                  20,
-                  26
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -171,10 +139,6 @@
                         "column": 22
                       }
                     },
-                    "range": [
-                      21,
-                      22
-                    ],
                     "name": "v"
                   }
                 ],
@@ -192,10 +156,6 @@
                       "column": 26
                     }
                   },
-                  "range": [
-                    24,
-                    26
-                  ],
                   "body": []
                 }
               }
@@ -204,5 +164,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/121/expected.json b/test/fixtures/harmony/uncategorised/121/expected.json
index bfbe2304f0..ae61f95fb4 100644
--- a/test/fixtures/harmony/uncategorised/121/expected.json
+++ b/test/fixtures/harmony/uncategorised/121/expected.json
@@ -12,10 +12,6 @@
       "column": 30
     }
   },
-  "range": [
-    0,
-    30
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 30
       }
     },
-    "range": [
-      0,
-      30
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 30
           }
         },
-        "range": [
-          0,
-          30
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 7
             }
           },
-          "range": [
-            6,
-            7
-          ],
           "name": "A"
         },
         "superClass": null,
@@ -89,10 +73,6 @@
               "column": 30
             }
           },
-          "range": [
-            8,
-            30
-          ],
           "body": [
             {
               "type": "MethodDefinition",
@@ -108,10 +88,6 @@
                   "column": 29
                 }
               },
-              "range": [
-                9,
-                29
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -127,10 +103,6 @@
                     "column": 13
                   }
                 },
-                "range": [
-                  10,
-                  13
-                ],
                 "name": "gen"
               },
               "static": false,
@@ -149,10 +121,6 @@
                     "column": 29
                   }
                 },
-                "range": [
-                  13,
-                  29
-                ],
                 "id": null,
                 "generator": true,
                 "expression": false,
@@ -171,10 +139,6 @@
                         "column": 15
                       }
                     },
-                    "range": [
-                      14,
-                      15
-                    ],
                     "name": "v"
                   }
                 ],
@@ -192,10 +156,6 @@
                       "column": 29
                     }
                   },
-                  "range": [
-                    17,
-                    29
-                  ],
                   "body": [
                     {
                       "type": "ExpressionStatement",
@@ -211,10 +171,6 @@
                           "column": 27
                         }
                       },
-                      "range": [
-                        19,
-                        27
-                      ],
                       "expression": {
                         "type": "YieldExpression",
                         "start": 19,
@@ -229,10 +185,6 @@
                             "column": 26
                           }
                         },
-                        "range": [
-                          19,
-                          26
-                        ],
                         "delegate": false,
                         "argument": {
                           "type": "Identifier",
@@ -248,10 +200,6 @@
                               "column": 26
                             }
                           },
-                          "range": [
-                            25,
-                            26
-                          ],
                           "name": "v"
                         }
                       }
@@ -264,5 +212,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/122/expected.json b/test/fixtures/harmony/uncategorised/122/expected.json
index 4f9a3b3590..305a0a44a9 100644
--- a/test/fixtures/harmony/uncategorised/122/expected.json
+++ b/test/fixtures/harmony/uncategorised/122/expected.json
@@ -12,10 +12,6 @@
       "column": 38
     }
   },
-  "range": [
-    0,
-    38
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 38
       }
     },
-    "range": [
-      0,
-      38
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 38
           }
         },
-        "range": [
-          0,
-          38
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 7
             }
           },
-          "range": [
-            6,
-            7
-          ],
           "name": "A"
         },
         "superClass": null,
@@ -89,10 +73,6 @@
               "column": 38
             }
           },
-          "range": [
-            8,
-            38
-          ],
           "body": [
             {
               "type": "MethodDefinition",
@@ -108,10 +88,6 @@
                   "column": 37
                 }
               },
-              "range": [
-                10,
-                37
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -127,10 +103,6 @@
                     "column": 21
                   }
                 },
-                "range": [
-                  18,
-                  21
-                ],
                 "name": "gen"
               },
               "static": true,
@@ -149,10 +121,6 @@
                     "column": 37
                   }
                 },
-                "range": [
-                  21,
-                  37
-                ],
                 "id": null,
                 "generator": true,
                 "expression": false,
@@ -171,10 +139,6 @@
                         "column": 23
                       }
                     },
-                    "range": [
-                      22,
-                      23
-                    ],
                     "name": "v"
                   }
                 ],
@@ -192,10 +156,6 @@
                       "column": 37
                     }
                   },
-                  "range": [
-                    25,
-                    37
-                  ],
                   "body": [
                     {
                       "type": "ExpressionStatement",
@@ -211,10 +171,6 @@
                           "column": 35
                         }
                       },
-                      "range": [
-                        27,
-                        35
-                      ],
                       "expression": {
                         "type": "YieldExpression",
                         "start": 27,
@@ -229,10 +185,6 @@
                             "column": 34
                           }
                         },
-                        "range": [
-                          27,
-                          34
-                        ],
                         "delegate": false,
                         "argument": {
                           "type": "Identifier",
@@ -248,10 +200,6 @@
                               "column": 34
                             }
                           },
-                          "range": [
-                            33,
-                            34
-                          ],
                           "name": "v"
                         }
                       }
@@ -264,5 +212,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/123/expected.json b/test/fixtures/harmony/uncategorised/123/expected.json
index a08a86c29e..4cf591f784 100644
--- a/test/fixtures/harmony/uncategorised/123/expected.json
+++ b/test/fixtures/harmony/uncategorised/123/expected.json
@@ -12,10 +12,6 @@
       "column": 51
     }
   },
-  "range": [
-    0,
-    51
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 51
       }
     },
-    "range": [
-      0,
-      51
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 13
           }
         },
-        "range": [
-          0,
-          13
-        ],
         "expression": {
           "type": "Literal",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            0,
-            12
-          ],
           "value": "use strict",
           "rawValue": "use strict",
           "raw": "\"use strict\""
@@ -91,10 +75,6 @@
             "column": 51
           }
         },
-        "range": [
-          14,
-          51
-        ],
         "expression": {
           "type": "ClassExpression",
           "start": 15,
@@ -109,10 +89,6 @@
               "column": 50
             }
           },
-          "range": [
-            15,
-            50
-          ],
           "id": {
             "type": "Identifier",
             "start": 21,
@@ -127,10 +103,6 @@
                 "column": 22
               }
             },
-            "range": [
-              21,
-              22
-            ],
             "name": "A"
           },
           "superClass": null,
@@ -148,10 +120,6 @@
                 "column": 50
               }
             },
-            "range": [
-              23,
-              50
-            ],
             "body": [
               {
                 "type": "MethodDefinition",
@@ -167,10 +135,6 @@
                     "column": 49
                   }
                 },
-                "range": [
-                  24,
-                  49
-                ],
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -186,10 +150,6 @@
                       "column": 35
                     }
                   },
-                  "range": [
-                    24,
-                    35
-                  ],
                   "name": "constructor"
                 },
                 "static": false,
@@ -208,10 +168,6 @@
                       "column": 49
                     }
                   },
-                  "range": [
-                    35,
-                    49
-                  ],
                   "id": null,
                   "generator": false,
                   "expression": false,
@@ -230,10 +186,6 @@
                         "column": 49
                       }
                     },
-                    "range": [
-                      38,
-                      49
-                    ],
                     "body": [
                       {
                         "type": "ExpressionStatement",
@@ -249,10 +201,6 @@
                             "column": 47
                           }
                         },
-                        "range": [
-                          40,
-                          47
-                        ],
                         "expression": {
                           "type": "CallExpression",
                           "start": 40,
@@ -267,10 +215,6 @@
                               "column": 47
                             }
                           },
-                          "range": [
-                            40,
-                            47
-                          ],
                           "callee": {
                             "type": "Super",
                             "start": 40,
@@ -284,11 +228,7 @@
                                 "line": 1,
                                 "column": 45
                               }
-                            },
-                            "range": [
-                              40,
-                              45
-                            ]
+                            }
                           },
                           "arguments": []
                         }
@@ -303,5 +243,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/128/expected.json b/test/fixtures/harmony/uncategorised/128/expected.json
index 38a79bf1f0..fe353f8bba 100644
--- a/test/fixtures/harmony/uncategorised/128/expected.json
+++ b/test/fixtures/harmony/uncategorised/128/expected.json
@@ -12,10 +12,6 @@
       "column": 25
     }
   },
-  "range": [
-    0,
-    25
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 25
       }
     },
-    "range": [
-      0,
-      25
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 25
           }
         },
-        "range": [
-          0,
-          25
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 7
             }
           },
-          "range": [
-            6,
-            7
-          ],
           "name": "A"
         },
         "superClass": null,
@@ -89,10 +73,6 @@
               "column": 25
             }
           },
-          "range": [
-            8,
-            25
-          ],
           "body": [
             {
               "type": "MethodDefinition",
@@ -108,10 +88,6 @@
                   "column": 24
                 }
               },
-              "range": [
-                9,
-                24
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -127,10 +103,6 @@
                     "column": 19
                   }
                 },
-                "range": [
-                  16,
-                  19
-                ],
                 "name": "foo"
               },
               "static": true,
@@ -149,10 +121,6 @@
                     "column": 24
                   }
                 },
-                "range": [
-                  19,
-                  24
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -171,10 +139,6 @@
                       "column": 24
                     }
                   },
-                  "range": [
-                    22,
-                    24
-                  ],
                   "body": []
                 }
               }
@@ -183,5 +147,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/129/expected.json b/test/fixtures/harmony/uncategorised/129/expected.json
index d007681d5d..6e71914af1 100644
--- a/test/fixtures/harmony/uncategorised/129/expected.json
+++ b/test/fixtures/harmony/uncategorised/129/expected.json
@@ -12,10 +12,6 @@
       "column": 34
     }
   },
-  "range": [
-    0,
-    34
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 34
       }
     },
-    "range": [
-      0,
-      34
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 34
           }
         },
-        "range": [
-          0,
-          34
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 7
             }
           },
-          "range": [
-            6,
-            7
-          ],
           "name": "A"
         },
         "superClass": null,
@@ -89,10 +73,6 @@
               "column": 34
             }
           },
-          "range": [
-            8,
-            34
-          ],
           "body": [
             {
               "type": "MethodDefinition",
@@ -108,10 +88,6 @@
                   "column": 17
                 }
               },
-              "range": [
-                9,
-                17
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -127,10 +103,6 @@
                     "column": 12
                   }
                 },
-                "range": [
-                  9,
-                  12
-                ],
                 "name": "foo"
               },
               "static": false,
@@ -149,10 +121,6 @@
                     "column": 17
                   }
                 },
-                "range": [
-                  12,
-                  17
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -171,10 +139,6 @@
                       "column": 17
                     }
                   },
-                  "range": [
-                    15,
-                    17
-                  ],
                   "body": []
                 }
               }
@@ -193,10 +157,6 @@
                   "column": 33
                 }
               },
-              "range": [
-                18,
-                33
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -212,10 +172,6 @@
                     "column": 28
                   }
                 },
-                "range": [
-                  25,
-                  28
-                ],
                 "name": "bar"
               },
               "static": true,
@@ -234,10 +190,6 @@
                     "column": 33
                   }
                 },
-                "range": [
-                  28,
-                  33
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -256,10 +208,6 @@
                       "column": 33
                     }
                   },
-                  "range": [
-                    31,
-                    33
-                  ],
                   "body": []
                 }
               }
@@ -268,5 +216,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/13/expected.json b/test/fixtures/harmony/uncategorised/13/expected.json
index 68b1e202b9..2f625b7911 100644
--- a/test/fixtures/harmony/uncategorised/13/expected.json
+++ b/test/fixtures/harmony/uncategorised/13/expected.json
@@ -12,10 +12,6 @@
       "column": 3
     }
   },
-  "range": [
-    0,
-    3
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 3
       }
     },
-    "range": [
-      0,
-      3
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 3
           }
         },
-        "range": [
-          0,
-          3
-        ],
         "expression": {
           "type": "Literal",
           "start": 0,
@@ -68,15 +56,12 @@
               "column": 3
             }
           },
-          "range": [
-            0,
-            3
-          ],
           "value": 1,
           "rawValue": 1,
           "raw": "0b1"
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/130/expected.json b/test/fixtures/harmony/uncategorised/130/expected.json
index 42678c8c97..c0bdfdc191 100644
--- a/test/fixtures/harmony/uncategorised/130/expected.json
+++ b/test/fixtures/harmony/uncategorised/130/expected.json
@@ -12,10 +12,6 @@
       "column": 59
     }
   },
-  "range": [
-    0,
-    59
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 59
       }
     },
-    "range": [
-      0,
-      59
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 13
           }
         },
-        "range": [
-          0,
-          13
-        ],
         "expression": {
           "type": "Literal",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            0,
-            12
-          ],
           "value": "use strict",
           "rawValue": "use strict",
           "raw": "\"use strict\""
@@ -91,10 +75,6 @@
             "column": 59
           }
         },
-        "range": [
-          14,
-          59
-        ],
         "expression": {
           "type": "ClassExpression",
           "start": 15,
@@ -109,10 +89,6 @@
               "column": 58
             }
           },
-          "range": [
-            15,
-            58
-          ],
           "id": {
             "type": "Identifier",
             "start": 21,
@@ -127,10 +103,6 @@
                 "column": 22
               }
             },
-            "range": [
-              21,
-              22
-            ],
             "name": "A"
           },
           "superClass": null,
@@ -148,10 +120,6 @@
                 "column": 58
               }
             },
-            "range": [
-              23,
-              58
-            ],
             "body": [
               {
                 "type": "MethodDefinition",
@@ -167,10 +135,6 @@
                     "column": 57
                   }
                 },
-                "range": [
-                  25,
-                  57
-                ],
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -186,10 +150,6 @@
                       "column": 43
                     }
                   },
-                  "range": [
-                    32,
-                    43
-                  ],
                   "name": "constructor"
                 },
                 "static": true,
@@ -208,10 +168,6 @@
                       "column": 57
                     }
                   },
-                  "range": [
-                    43,
-                    57
-                  ],
                   "id": null,
                   "generator": false,
                   "expression": false,
@@ -230,10 +186,6 @@
                         "column": 57
                       }
                     },
-                    "range": [
-                      46,
-                      57
-                    ],
                     "body": [
                       {
                         "type": "ExpressionStatement",
@@ -249,10 +201,6 @@
                             "column": 55
                           }
                         },
-                        "range": [
-                          48,
-                          55
-                        ],
                         "expression": {
                           "type": "CallExpression",
                           "start": 48,
@@ -267,10 +215,6 @@
                               "column": 55
                             }
                           },
-                          "range": [
-                            48,
-                            55
-                          ],
                           "callee": {
                             "type": "Super",
                             "start": 48,
@@ -284,11 +228,7 @@
                                 "line": 1,
                                 "column": 53
                               }
-                            },
-                            "range": [
-                              48,
-                              53
-                            ]
+                            }
                           },
                           "arguments": []
                         }
@@ -303,5 +243,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/131/expected.json b/test/fixtures/harmony/uncategorised/131/expected.json
index 61ebd222a8..ee42e3d61e 100644
--- a/test/fixtures/harmony/uncategorised/131/expected.json
+++ b/test/fixtures/harmony/uncategorised/131/expected.json
@@ -12,10 +12,6 @@
       "column": 28
     }
   },
-  "range": [
-    0,
-    28
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 28
       }
     },
-    "range": [
-      0,
-      28
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 28
           }
         },
-        "range": [
-          0,
-          28
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 7
             }
           },
-          "range": [
-            6,
-            7
-          ],
           "name": "A"
         },
         "superClass": null,
@@ -89,10 +73,6 @@
               "column": 28
             }
           },
-          "range": [
-            8,
-            28
-          ],
           "body": [
             {
               "type": "MethodDefinition",
@@ -108,10 +88,6 @@
                   "column": 18
                 }
               },
-              "range": [
-                10,
-                18
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -127,10 +103,6 @@
                     "column": 13
                   }
                 },
-                "range": [
-                  10,
-                  13
-                ],
                 "name": "foo"
               },
               "static": false,
@@ -149,10 +121,6 @@
                     "column": 18
                   }
                 },
-                "range": [
-                  13,
-                  18
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -171,10 +139,6 @@
                       "column": 18
                     }
                   },
-                  "range": [
-                    16,
-                    18
-                  ],
                   "body": []
                 }
               }
@@ -193,10 +157,6 @@
                   "column": 27
                 }
               },
-              "range": [
-                19,
-                27
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -212,10 +172,6 @@
                     "column": 22
                   }
                 },
-                "range": [
-                  19,
-                  22
-                ],
                 "name": "bar"
               },
               "static": false,
@@ -234,10 +190,6 @@
                     "column": 27
                   }
                 },
-                "range": [
-                  22,
-                  27
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -256,10 +208,6 @@
                       "column": 27
                     }
                   },
-                  "range": [
-                    25,
-                    27
-                  ],
                   "body": []
                 }
               }
@@ -268,5 +216,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/132/expected.json b/test/fixtures/harmony/uncategorised/132/expected.json
index bd0dfa4081..1cdc2db117 100644
--- a/test/fixtures/harmony/uncategorised/132/expected.json
+++ b/test/fixtures/harmony/uncategorised/132/expected.json
@@ -12,10 +12,6 @@
       "column": 37
     }
   },
-  "range": [
-    0,
-    37
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 37
       }
     },
-    "range": [
-      0,
-      37
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 37
           }
         },
-        "range": [
-          0,
-          37
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 7
             }
           },
-          "range": [
-            6,
-            7
-          ],
           "name": "A"
         },
         "superClass": null,
@@ -89,10 +73,6 @@
               "column": 37
             }
           },
-          "range": [
-            8,
-            37
-          ],
           "body": [
             {
               "type": "MethodDefinition",
@@ -108,10 +88,6 @@
                   "column": 22
                 }
               },
-              "range": [
-                10,
-                22
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -127,10 +103,6 @@
                     "column": 17
                   }
                 },
-                "range": [
-                  14,
-                  17
-                ],
                 "name": "foo"
               },
               "static": false,
@@ -149,10 +121,6 @@
                     "column": 22
                   }
                 },
-                "range": [
-                  17,
-                  22
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -171,10 +139,6 @@
                       "column": 22
                     }
                   },
-                  "range": [
-                    20,
-                    22
-                  ],
                   "body": []
                 }
               }
@@ -193,10 +157,6 @@
                   "column": 36
                 }
               },
-              "range": [
-                23,
-                36
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -212,10 +172,6 @@
                     "column": 30
                   }
                 },
-                "range": [
-                  27,
-                  30
-                ],
                 "name": "foo"
               },
               "static": false,
@@ -234,10 +190,6 @@
                     "column": 36
                   }
                 },
-                "range": [
-                  30,
-                  36
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -256,10 +208,6 @@
                         "column": 32
                       }
                     },
-                    "range": [
-                      31,
-                      32
-                    ],
                     "name": "v"
                   }
                 ],
@@ -277,10 +225,6 @@
                       "column": 36
                     }
                   },
-                  "range": [
-                    34,
-                    36
-                  ],
                   "body": []
                 }
               }
@@ -289,5 +233,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/133/expected.json b/test/fixtures/harmony/uncategorised/133/expected.json
index 633498acde..5c02d2eecd 100644
--- a/test/fixtures/harmony/uncategorised/133/expected.json
+++ b/test/fixtures/harmony/uncategorised/133/expected.json
@@ -12,10 +12,6 @@
       "column": 43
     }
   },
-  "range": [
-    0,
-    43
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 43
       }
     },
-    "range": [
-      0,
-      43
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 43
           }
         },
-        "range": [
-          0,
-          43
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 7
             }
           },
-          "range": [
-            6,
-            7
-          ],
           "name": "A"
         },
         "superClass": null,
@@ -89,10 +73,6 @@
               "column": 43
             }
           },
-          "range": [
-            8,
-            43
-          ],
           "body": [
             {
               "type": "MethodDefinition",
@@ -108,10 +88,6 @@
                   "column": 29
                 }
               },
-              "range": [
-                10,
-                29
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -127,10 +103,6 @@
                     "column": 24
                   }
                 },
-                "range": [
-                  21,
-                  24
-                ],
                 "name": "foo"
               },
               "static": true,
@@ -149,10 +121,6 @@
                     "column": 29
                   }
                 },
-                "range": [
-                  24,
-                  29
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -171,10 +139,6 @@
                       "column": 29
                     }
                   },
-                  "range": [
-                    27,
-                    29
-                  ],
                   "body": []
                 }
               }
@@ -193,10 +157,6 @@
                   "column": 42
                 }
               },
-              "range": [
-                30,
-                42
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -212,10 +172,6 @@
                     "column": 37
                   }
                 },
-                "range": [
-                  34,
-                  37
-                ],
                 "name": "foo"
               },
               "static": false,
@@ -234,10 +190,6 @@
                     "column": 42
                   }
                 },
-                "range": [
-                  37,
-                  42
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -256,10 +208,6 @@
                       "column": 42
                     }
                   },
-                  "range": [
-                    40,
-                    42
-                  ],
                   "body": []
                 }
               }
@@ -268,5 +216,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/134/expected.json b/test/fixtures/harmony/uncategorised/134/expected.json
index 0707a1e872..7254b30243 100644
--- a/test/fixtures/harmony/uncategorised/134/expected.json
+++ b/test/fixtures/harmony/uncategorised/134/expected.json
@@ -12,10 +12,6 @@
       "column": 51
     }
   },
-  "range": [
-    0,
-    51
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 51
       }
     },
-    "range": [
-      0,
-      51
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 51
           }
         },
-        "range": [
-          0,
-          51
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 7
             }
           },
-          "range": [
-            6,
-            7
-          ],
           "name": "A"
         },
         "superClass": null,
@@ -89,10 +73,6 @@
               "column": 51
             }
           },
-          "range": [
-            8,
-            51
-          ],
           "body": [
             {
               "type": "MethodDefinition",
@@ -108,10 +88,6 @@
                   "column": 29
                 }
               },
-              "range": [
-                10,
-                29
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -127,10 +103,6 @@
                     "column": 24
                   }
                 },
-                "range": [
-                  21,
-                  24
-                ],
                 "name": "foo"
               },
               "static": true,
@@ -149,10 +121,6 @@
                     "column": 29
                   }
                 },
-                "range": [
-                  24,
-                  29
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -171,10 +139,6 @@
                       "column": 29
                     }
                   },
-                  "range": [
-                    27,
-                    29
-                  ],
                   "body": []
                 }
               }
@@ -193,10 +157,6 @@
                   "column": 49
                 }
               },
-              "range": [
-                30,
-                49
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -212,10 +172,6 @@
                     "column": 44
                   }
                 },
-                "range": [
-                  41,
-                  44
-                ],
                 "name": "bar"
               },
               "static": true,
@@ -234,10 +190,6 @@
                     "column": 49
                   }
                 },
-                "range": [
-                  44,
-                  49
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -256,10 +208,6 @@
                       "column": 49
                     }
                   },
-                  "range": [
-                    47,
-                    49
-                  ],
                   "body": []
                 }
               }
@@ -268,5 +216,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/135/expected.json b/test/fixtures/harmony/uncategorised/135/expected.json
index 0af49eedb3..0b1130de7c 100644
--- a/test/fixtures/harmony/uncategorised/135/expected.json
+++ b/test/fixtures/harmony/uncategorised/135/expected.json
@@ -12,10 +12,6 @@
       "column": 78
     }
   },
-  "range": [
-    0,
-    78
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 78
       }
     },
-    "range": [
-      0,
-      78
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 78
           }
         },
-        "range": [
-          0,
-          78
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 7
             }
           },
-          "range": [
-            6,
-            7
-          ],
           "name": "A"
         },
         "superClass": null,
@@ -89,10 +73,6 @@
               "column": 78
             }
           },
-          "range": [
-            8,
-            78
-          ],
           "body": [
             {
               "type": "MethodDefinition",
@@ -108,10 +88,6 @@
                   "column": 29
                 }
               },
-              "range": [
-                10,
-                29
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -127,10 +103,6 @@
                     "column": 24
                   }
                 },
-                "range": [
-                  21,
-                  24
-                ],
                 "name": "foo"
               },
               "static": true,
@@ -149,10 +121,6 @@
                     "column": 29
                   }
                 },
-                "range": [
-                  24,
-                  29
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -171,10 +139,6 @@
                       "column": 29
                     }
                   },
-                  "range": [
-                    27,
-                    29
-                  ],
                   "body": []
                 }
               }
@@ -193,10 +157,6 @@
                   "column": 50
                 }
               },
-              "range": [
-                30,
-                50
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -212,10 +172,6 @@
                     "column": 44
                   }
                 },
-                "range": [
-                  41,
-                  44
-                ],
                 "name": "foo"
               },
               "static": true,
@@ -234,10 +190,6 @@
                     "column": 50
                   }
                 },
-                "range": [
-                  44,
-                  50
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -256,10 +208,6 @@
                         "column": 46
                       }
                     },
-                    "range": [
-                      45,
-                      46
-                    ],
                     "name": "v"
                   }
                 ],
@@ -277,10 +225,6 @@
                       "column": 50
                     }
                   },
-                  "range": [
-                    48,
-                    50
-                  ],
                   "body": []
                 }
               }
@@ -299,10 +243,6 @@
                   "column": 63
                 }
               },
-              "range": [
-                51,
-                63
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -318,10 +258,6 @@
                     "column": 58
                   }
                 },
-                "range": [
-                  55,
-                  58
-                ],
                 "name": "foo"
               },
               "static": false,
@@ -340,10 +276,6 @@
                     "column": 63
                   }
                 },
-                "range": [
-                  58,
-                  63
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -362,10 +294,6 @@
                       "column": 63
                     }
                   },
-                  "range": [
-                    61,
-                    63
-                  ],
                   "body": []
                 }
               }
@@ -384,10 +312,6 @@
                   "column": 77
                 }
               },
-              "range": [
-                64,
-                77
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -403,10 +327,6 @@
                     "column": 71
                   }
                 },
-                "range": [
-                  68,
-                  71
-                ],
                 "name": "foo"
               },
               "static": false,
@@ -425,10 +345,6 @@
                     "column": 77
                   }
                 },
-                "range": [
-                  71,
-                  77
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -447,10 +363,6 @@
                         "column": 73
                       }
                     },
-                    "range": [
-                      72,
-                      73
-                    ],
                     "name": "v"
                   }
                 ],
@@ -468,10 +380,6 @@
                       "column": 77
                     }
                   },
-                  "range": [
-                    75,
-                    77
-                  ],
                   "body": []
                 }
               }
@@ -480,5 +388,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/136/expected.json b/test/fixtures/harmony/uncategorised/136/expected.json
index 77970e1f12..2e0cf52943 100644
--- a/test/fixtures/harmony/uncategorised/136/expected.json
+++ b/test/fixtures/harmony/uncategorised/136/expected.json
@@ -12,10 +12,6 @@
       "column": 29
     }
   },
-  "range": [
-    0,
-    29
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 29
       }
     },
-    "range": [
-      0,
-      29
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 29
           }
         },
-        "range": [
-          0,
-          29
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 7
             }
           },
-          "range": [
-            6,
-            7
-          ],
           "name": "A"
         },
         "superClass": null,
@@ -89,10 +73,6 @@
               "column": 29
             }
           },
-          "range": [
-            8,
-            29
-          ],
           "body": [
             {
               "type": "MethodDefinition",
@@ -108,10 +88,6 @@
                   "column": 27
                 }
               },
-              "range": [
-                10,
-                27
-              ],
               "computed": true,
               "key": {
                 "type": "Identifier",
@@ -127,10 +103,6 @@
                     "column": 21
                   }
                 },
-                "range": [
-                  18,
-                  21
-                ],
                 "name": "foo"
               },
               "static": true,
@@ -149,10 +121,6 @@
                     "column": 27
                   }
                 },
-                "range": [
-                  22,
-                  27
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -171,10 +139,6 @@
                       "column": 27
                     }
                   },
-                  "range": [
-                    25,
-                    27
-                  ],
                   "body": []
                 }
               }
@@ -183,5 +147,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/137/expected.json b/test/fixtures/harmony/uncategorised/137/expected.json
index f2d68f9da6..81860c95fb 100644
--- a/test/fixtures/harmony/uncategorised/137/expected.json
+++ b/test/fixtures/harmony/uncategorised/137/expected.json
@@ -12,10 +12,6 @@
       "column": 33
     }
   },
-  "range": [
-    0,
-    33
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 33
       }
     },
-    "range": [
-      0,
-      33
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 33
           }
         },
-        "range": [
-          0,
-          33
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 7
             }
           },
-          "range": [
-            6,
-            7
-          ],
           "name": "A"
         },
         "superClass": null,
@@ -89,10 +73,6 @@
               "column": 33
             }
           },
-          "range": [
-            8,
-            33
-          ],
           "body": [
             {
               "type": "MethodDefinition",
@@ -108,10 +88,6 @@
                   "column": 31
                 }
               },
-              "range": [
-                10,
-                31
-              ],
               "computed": true,
               "key": {
                 "type": "Identifier",
@@ -127,10 +103,6 @@
                     "column": 25
                   }
                 },
-                "range": [
-                  22,
-                  25
-                ],
                 "name": "foo"
               },
               "static": true,
@@ -149,10 +121,6 @@
                     "column": 31
                   }
                 },
-                "range": [
-                  26,
-                  31
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -171,10 +139,6 @@
                       "column": 31
                     }
                   },
-                  "range": [
-                    29,
-                    31
-                  ],
                   "body": []
                 }
               }
@@ -183,5 +147,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/138/expected.json b/test/fixtures/harmony/uncategorised/138/expected.json
index 133e316e83..dec1437174 100644
--- a/test/fixtures/harmony/uncategorised/138/expected.json
+++ b/test/fixtures/harmony/uncategorised/138/expected.json
@@ -12,10 +12,6 @@
       "column": 38
     }
   },
-  "range": [
-    0,
-    38
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 38
       }
     },
-    "range": [
-      0,
-      38
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 38
           }
         },
-        "range": [
-          0,
-          38
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 7
             }
           },
-          "range": [
-            6,
-            7
-          ],
           "name": "A"
         },
         "superClass": null,
@@ -89,10 +73,6 @@
               "column": 38
             }
           },
-          "range": [
-            8,
-            38
-          ],
           "body": [
             {
               "type": "MethodDefinition",
@@ -108,10 +88,6 @@
                   "column": 23
                 }
               },
-              "range": [
-                10,
-                23
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -127,10 +103,6 @@
                     "column": 17
                   }
                 },
-                "range": [
-                  14,
-                  17
-                ],
                 "name": "foo"
               },
               "static": false,
@@ -149,10 +121,6 @@
                     "column": 23
                   }
                 },
-                "range": [
-                  17,
-                  23
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -171,10 +139,6 @@
                         "column": 19
                       }
                     },
-                    "range": [
-                      18,
-                      19
-                    ],
                     "name": "v"
                   }
                 ],
@@ -192,10 +156,6 @@
                       "column": 23
                     }
                   },
-                  "range": [
-                    21,
-                    23
-                  ],
                   "body": []
                 }
               }
@@ -214,10 +174,6 @@
                   "column": 36
                 }
               },
-              "range": [
-                24,
-                36
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -233,10 +189,6 @@
                     "column": 31
                   }
                 },
-                "range": [
-                  28,
-                  31
-                ],
                 "name": "foo"
               },
               "static": false,
@@ -255,10 +207,6 @@
                     "column": 36
                   }
                 },
-                "range": [
-                  31,
-                  36
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -277,10 +225,6 @@
                       "column": 36
                     }
                   },
-                  "range": [
-                    34,
-                    36
-                  ],
                   "body": []
                 }
               }
@@ -289,5 +233,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/139/expected.json b/test/fixtures/harmony/uncategorised/139/expected.json
index d0d6907fe0..bde2d7b1d9 100644
--- a/test/fixtures/harmony/uncategorised/139/expected.json
+++ b/test/fixtures/harmony/uncategorised/139/expected.json
@@ -12,10 +12,6 @@
       "column": 33
     }
   },
-  "range": [
-    0,
-    33
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 33
       }
     },
-    "range": [
-      0,
-      33
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 33
           }
         },
-        "range": [
-          0,
-          33
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 7
             }
           },
-          "range": [
-            6,
-            7
-          ],
           "name": "A"
         },
         "superClass": null,
@@ -89,10 +73,6 @@
               "column": 33
             }
           },
-          "range": [
-            8,
-            33
-          ],
           "body": [
             {
               "type": "MethodDefinition",
@@ -108,10 +88,6 @@
                   "column": 18
                 }
               },
-              "range": [
-                10,
-                18
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -127,10 +103,6 @@
                     "column": 13
                   }
                 },
-                "range": [
-                  10,
-                  13
-                ],
                 "name": "foo"
               },
               "static": false,
@@ -149,10 +121,6 @@
                     "column": 18
                   }
                 },
-                "range": [
-                  13,
-                  18
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -171,10 +139,6 @@
                       "column": 18
                     }
                   },
-                  "range": [
-                    16,
-                    18
-                  ],
                   "body": []
                 }
               }
@@ -193,10 +157,6 @@
                   "column": 31
                 }
               },
-              "range": [
-                19,
-                31
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -212,10 +172,6 @@
                     "column": 26
                   }
                 },
-                "range": [
-                  23,
-                  26
-                ],
                 "name": "foo"
               },
               "static": false,
@@ -234,10 +190,6 @@
                     "column": 31
                   }
                 },
-                "range": [
-                  26,
-                  31
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -256,10 +208,6 @@
                       "column": 31
                     }
                   },
-                  "range": [
-                    29,
-                    31
-                  ],
                   "body": []
                 }
               }
@@ -268,5 +216,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/14/expected.json b/test/fixtures/harmony/uncategorised/14/expected.json
index 11d6629495..49de700092 100644
--- a/test/fixtures/harmony/uncategorised/14/expected.json
+++ b/test/fixtures/harmony/uncategorised/14/expected.json
@@ -12,10 +12,6 @@
       "column": 4
     }
   },
-  "range": [
-    0,
-    4
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 4
       }
     },
-    "range": [
-      0,
-      4
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 4
           }
         },
-        "range": [
-          0,
-          4
-        ],
         "expression": {
           "type": "Literal",
           "start": 0,
@@ -68,15 +56,12 @@
               "column": 4
             }
           },
-          "range": [
-            0,
-            4
-          ],
           "value": 2,
           "rawValue": 2,
           "raw": "0b10"
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/140/expected.json b/test/fixtures/harmony/uncategorised/140/expected.json
index 3753e5e93b..bb91764245 100644
--- a/test/fixtures/harmony/uncategorised/140/expected.json
+++ b/test/fixtures/harmony/uncategorised/140/expected.json
@@ -12,10 +12,6 @@
       "column": 21
     }
   },
-  "range": [
-    0,
-    21
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 21
       }
     },
-    "range": [
-      0,
-      21
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 21
           }
         },
-        "range": [
-          0,
-          21
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 15
             }
           },
-          "range": [
-            6,
-            15
-          ],
           "name": "Semicolon"
         },
         "superClass": null,
@@ -89,13 +73,10 @@
               "column": 21
             }
           },
-          "range": [
-            16,
-            21
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/141/expected.json b/test/fixtures/harmony/uncategorised/141/expected.json
index 50f51ac49c..3ab0349417 100644
--- a/test/fixtures/harmony/uncategorised/141/expected.json
+++ b/test/fixtures/harmony/uncategorised/141/expected.json
@@ -12,10 +12,6 @@
       "column": 11
     }
   },
-  "range": [
-    0,
-    11
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 11
       }
     },
-    "range": [
-      0,
-      11
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 11
           }
         },
-        "range": [
-          0,
-          11
-        ],
         "expression": {
           "type": "ObjectExpression",
           "start": 1,
@@ -68,10 +56,6 @@
               "column": 10
             }
           },
-          "range": [
-            1,
-            10
-          ],
           "properties": [
             {
               "type": "Property",
@@ -87,10 +71,6 @@
                   "column": 9
                 }
               },
-              "range": [
-                2,
-                9
-              ],
               "method": false,
               "shorthand": false,
               "computed": true,
@@ -108,10 +88,6 @@
                     "column": 4
                   }
                 },
-                "range": [
-                  3,
-                  4
-                ],
                 "name": "x"
               },
               "value": {
@@ -128,10 +104,6 @@
                     "column": 9
                   }
                 },
-                "range": [
-                  7,
-                  9
-                ],
                 "value": 10,
                 "rawValue": 10,
                 "raw": "10"
@@ -143,5 +115,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/142/expected.json b/test/fixtures/harmony/uncategorised/142/expected.json
index 4f0178e80f..970e72e609 100644
--- a/test/fixtures/harmony/uncategorised/142/expected.json
+++ b/test/fixtures/harmony/uncategorised/142/expected.json
@@ -12,10 +12,6 @@
       "column": 19
     }
   },
-  "range": [
-    0,
-    19
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 19
       }
     },
-    "range": [
-      0,
-      19
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 19
           }
         },
-        "range": [
-          0,
-          19
-        ],
         "expression": {
           "type": "ObjectExpression",
           "start": 1,
@@ -68,10 +56,6 @@
               "column": 18
             }
           },
-          "range": [
-            1,
-            18
-          ],
           "properties": [
             {
               "type": "Property",
@@ -87,10 +71,6 @@
                   "column": 17
                 }
               },
-              "range": [
-                2,
-                17
-              ],
               "method": false,
               "shorthand": false,
               "computed": true,
@@ -108,10 +88,6 @@
                     "column": 12
                   }
                 },
-                "range": [
-                  3,
-                  12
-                ],
                 "left": {
                   "type": "Literal",
                   "start": 3,
@@ -126,10 +102,6 @@
                       "column": 6
                     }
                   },
-                  "range": [
-                    3,
-                    6
-                  ],
                   "value": "x",
                   "rawValue": "x",
                   "raw": "\"x\""
@@ -149,10 +121,6 @@
                       "column": 12
                     }
                   },
-                  "range": [
-                    9,
-                    12
-                  ],
                   "value": "y",
                   "rawValue": "y",
                   "raw": "\"y\""
@@ -172,10 +140,6 @@
                     "column": 17
                   }
                 },
-                "range": [
-                  15,
-                  17
-                ],
                 "value": 10,
                 "rawValue": 10,
                 "raw": "10"
@@ -187,5 +151,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/143/expected.json b/test/fixtures/harmony/uncategorised/143/expected.json
index f99dd153d0..d73cb3b632 100644
--- a/test/fixtures/harmony/uncategorised/143/expected.json
+++ b/test/fixtures/harmony/uncategorised/143/expected.json
@@ -12,10 +12,6 @@
       "column": 22
     }
   },
-  "range": [
-    0,
-    22
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 22
       }
     },
-    "range": [
-      0,
-      22
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 22
           }
         },
-        "range": [
-          0,
-          22
-        ],
         "expression": {
           "type": "ObjectExpression",
           "start": 1,
@@ -68,10 +56,6 @@
               "column": 21
             }
           },
-          "range": [
-            1,
-            21
-          ],
           "properties": [
             {
               "type": "Property",
@@ -87,10 +71,6 @@
                   "column": 20
                 }
               },
-              "range": [
-                2,
-                20
-              ],
               "method": false,
               "shorthand": false,
               "computed": true,
@@ -108,10 +88,6 @@
                     "column": 4
                   }
                 },
-                "range": [
-                  3,
-                  4
-                ],
                 "name": "x"
               },
               "value": {
@@ -128,10 +104,6 @@
                     "column": 20
                   }
                 },
-                "range": [
-                  7,
-                  20
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -150,10 +122,6 @@
                       "column": 20
                     }
                   },
-                  "range": [
-                    18,
-                    20
-                  ],
                   "body": []
                 }
               },
@@ -164,5 +132,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/144/expected.json b/test/fixtures/harmony/uncategorised/144/expected.json
index df4487b72e..682d65ed9c 100644
--- a/test/fixtures/harmony/uncategorised/144/expected.json
+++ b/test/fixtures/harmony/uncategorised/144/expected.json
@@ -12,10 +12,6 @@
       "column": 18
     }
   },
-  "range": [
-    0,
-    18
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 18
       }
     },
-    "range": [
-      0,
-      18
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 18
           }
         },
-        "range": [
-          0,
-          18
-        ],
         "expression": {
           "type": "ObjectExpression",
           "start": 1,
@@ -68,10 +56,6 @@
               "column": 17
             }
           },
-          "range": [
-            1,
-            17
-          ],
           "properties": [
             {
               "type": "Property",
@@ -87,10 +71,6 @@
                   "column": 9
                 }
               },
-              "range": [
-                2,
-                9
-              ],
               "method": false,
               "shorthand": false,
               "computed": true,
@@ -108,10 +88,6 @@
                     "column": 4
                   }
                 },
-                "range": [
-                  3,
-                  4
-                ],
                 "name": "x"
               },
               "value": {
@@ -128,10 +104,6 @@
                     "column": 9
                   }
                 },
-                "range": [
-                  7,
-                  9
-                ],
                 "value": 10,
                 "rawValue": 10,
                 "raw": "10"
@@ -152,10 +124,6 @@
                   "column": 16
                 }
               },
-              "range": [
-                11,
-                16
-              ],
               "method": false,
               "shorthand": false,
               "computed": false,
@@ -173,10 +141,6 @@
                     "column": 12
                   }
                 },
-                "range": [
-                  11,
-                  12
-                ],
                 "name": "y"
               },
               "value": {
@@ -193,10 +157,6 @@
                     "column": 16
                   }
                 },
-                "range": [
-                  14,
-                  16
-                ],
                 "value": 20,
                 "rawValue": 20,
                 "raw": "20"
@@ -208,5 +168,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/145/expected.json b/test/fixtures/harmony/uncategorised/145/expected.json
index 344cc40864..081f297ff9 100644
--- a/test/fixtures/harmony/uncategorised/145/expected.json
+++ b/test/fixtures/harmony/uncategorised/145/expected.json
@@ -12,10 +12,6 @@
       "column": 31
     }
   },
-  "range": [
-    0,
-    31
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 31
       }
     },
-    "range": [
-      0,
-      31
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 31
           }
         },
-        "range": [
-          0,
-          31
-        ],
         "expression": {
           "type": "ObjectExpression",
           "start": 1,
@@ -68,10 +56,6 @@
               "column": 30
             }
           },
-          "range": [
-            1,
-            30
-          ],
           "properties": [
             {
               "type": "Property",
@@ -87,10 +71,6 @@
                   "column": 14
                 }
               },
-              "range": [
-                2,
-                14
-              ],
               "method": false,
               "shorthand": false,
               "computed": true,
@@ -108,10 +88,6 @@
                     "column": 8
                   }
                 },
-                "range": [
-                  7,
-                  8
-                ],
                 "name": "x"
               },
               "kind": "get",
@@ -129,10 +105,6 @@
                     "column": 14
                   }
                 },
-                "range": [
-                  9,
-                  14
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -151,10 +123,6 @@
                       "column": 14
                     }
                   },
-                  "range": [
-                    12,
-                    14
-                  ],
                   "body": []
                 }
               }
@@ -173,10 +141,6 @@
                   "column": 29
                 }
               },
-              "range": [
-                16,
-                29
-              ],
               "method": false,
               "shorthand": false,
               "computed": true,
@@ -194,10 +158,6 @@
                     "column": 22
                   }
                 },
-                "range": [
-                  21,
-                  22
-                ],
                 "name": "x"
               },
               "kind": "set",
@@ -215,10 +175,6 @@
                     "column": 29
                   }
                 },
-                "range": [
-                  23,
-                  29
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -237,10 +193,6 @@
                         "column": 25
                       }
                     },
-                    "range": [
-                      24,
-                      25
-                    ],
                     "name": "v"
                   }
                 ],
@@ -258,10 +210,6 @@
                       "column": 29
                     }
                   },
-                  "range": [
-                    27,
-                    29
-                  ],
                   "body": []
                 }
               }
@@ -271,5 +219,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/146/expected.json b/test/fixtures/harmony/uncategorised/146/expected.json
index dea23e5746..084e6c8144 100644
--- a/test/fixtures/harmony/uncategorised/146/expected.json
+++ b/test/fixtures/harmony/uncategorised/146/expected.json
@@ -12,10 +12,6 @@
       "column": 12
     }
   },
-  "range": [
-    0,
-    12
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 12
       }
     },
-    "range": [
-      0,
-      12
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 12
           }
         },
-        "range": [
-          0,
-          12
-        ],
         "expression": {
           "type": "ObjectExpression",
           "start": 1,
@@ -68,10 +56,6 @@
               "column": 11
             }
           },
-          "range": [
-            1,
-            11
-          ],
           "properties": [
             {
               "type": "Property",
@@ -87,10 +71,6 @@
                   "column": 10
                 }
               },
-              "range": [
-                2,
-                10
-              ],
               "method": true,
               "shorthand": false,
               "computed": true,
@@ -108,10 +88,6 @@
                     "column": 4
                   }
                 },
-                "range": [
-                  3,
-                  4
-                ],
                 "name": "x"
               },
               "kind": "init",
@@ -129,10 +105,6 @@
                     "column": 10
                   }
                 },
-                "range": [
-                  5,
-                  10
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -151,10 +123,6 @@
                       "column": 10
                     }
                   },
-                  "range": [
-                    8,
-                    10
-                  ],
                   "body": []
                 }
               }
@@ -164,5 +132,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/147/expected.json b/test/fixtures/harmony/uncategorised/147/expected.json
index f720c47d16..f4966b1c1f 100644
--- a/test/fixtures/harmony/uncategorised/147/expected.json
+++ b/test/fixtures/harmony/uncategorised/147/expected.json
@@ -12,10 +12,6 @@
       "column": 18
     }
   },
-  "range": [
-    0,
-    18
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 18
       }
     },
-    "range": [
-      0,
-      18
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 18
           }
         },
-        "range": [
-          0,
-          18
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 18
               }
             },
-            "range": [
-              4,
-              18
-            ],
             "id": {
               "type": "ObjectPattern",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 12
                 }
               },
-              "range": [
-                4,
-                12
-              ],
               "properties": [
                 {
                   "type": "Property",
@@ -106,10 +86,6 @@
                       "column": 11
                     }
                   },
-                  "range": [
-                    5,
-                    11
-                  ],
                   "method": false,
                   "shorthand": false,
                   "computed": true,
@@ -127,10 +103,6 @@
                         "column": 7
                       }
                     },
-                    "range": [
-                      6,
-                      7
-                    ],
                     "name": "x"
                   },
                   "value": {
@@ -147,10 +119,6 @@
                         "column": 11
                       }
                     },
-                    "range": [
-                      10,
-                      11
-                    ],
                     "name": "y"
                   },
                   "kind": "init"
@@ -171,10 +139,6 @@
                   "column": 18
                 }
               },
-              "range": [
-                15,
-                18
-              ],
               "properties": [
                 {
                   "type": "Property",
@@ -190,10 +154,6 @@
                       "column": 17
                     }
                   },
-                  "range": [
-                    16,
-                    17
-                  ],
                   "method": false,
                   "shorthand": true,
                   "computed": false,
@@ -211,10 +171,6 @@
                         "column": 17
                       }
                     },
-                    "range": [
-                      16,
-                      17
-                    ],
                     "name": "y"
                   },
                   "kind": "init",
@@ -232,10 +188,6 @@
                         "column": 17
                       }
                     },
-                    "range": [
-                      16,
-                      17
-                    ],
                     "name": "y"
                   }
                 }
@@ -246,5 +198,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/148/expected.json b/test/fixtures/harmony/uncategorised/148/expected.json
index 9f1ac19fe0..35f50da821 100644
--- a/test/fixtures/harmony/uncategorised/148/expected.json
+++ b/test/fixtures/harmony/uncategorised/148/expected.json
@@ -12,10 +12,6 @@
       "column": 23
     }
   },
-  "range": [
-    0,
-    23
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 23
       }
     },
-    "range": [
-      0,
-      23
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 23
           }
         },
-        "range": [
-          0,
-          23
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 10
             }
           },
-          "range": [
-            9,
-            10
-          ],
           "name": "f"
         },
         "generator": false,
@@ -91,10 +75,6 @@
                 "column": 19
               }
             },
-            "range": [
-              11,
-              19
-            ],
             "properties": [
               {
                 "type": "Property",
@@ -110,10 +90,6 @@
                     "column": 18
                   }
                 },
-                "range": [
-                  12,
-                  18
-                ],
                 "method": false,
                 "shorthand": false,
                 "computed": true,
@@ -131,10 +107,6 @@
                       "column": 14
                     }
                   },
-                  "range": [
-                    13,
-                    14
-                  ],
                   "name": "x"
                 },
                 "value": {
@@ -151,10 +123,6 @@
                       "column": 18
                     }
                   },
-                  "range": [
-                    17,
-                    18
-                  ],
                   "name": "y"
                 },
                 "kind": "init"
@@ -176,13 +144,10 @@
               "column": 23
             }
           },
-          "range": [
-            21,
-            23
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/149/expected.json b/test/fixtures/harmony/uncategorised/149/expected.json
index 2558dda873..622622b2ef 100644
--- a/test/fixtures/harmony/uncategorised/149/expected.json
+++ b/test/fixtures/harmony/uncategorised/149/expected.json
@@ -12,10 +12,6 @@
       "column": 33
     }
   },
-  "range": [
-    0,
-    33
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 33
       }
     },
-    "range": [
-      0,
-      33
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 33
           }
         },
-        "range": [
-          0,
-          33
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 33
               }
             },
-            "range": [
-              4,
-              33
-            ],
             "id": {
               "type": "Identifier",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 5
                 }
               },
-              "range": [
-                4,
-                5
-              ],
               "name": "x"
             },
             "init": {
@@ -107,10 +87,6 @@
                   "column": 33
                 }
               },
-              "range": [
-                8,
-                33
-              ],
               "properties": [
                 {
                   "type": "Property",
@@ -126,10 +102,6 @@
                       "column": 32
                     }
                   },
-                  "range": [
-                    9,
-                    32
-                  ],
                   "method": true,
                   "shorthand": false,
                   "computed": true,
@@ -147,10 +119,6 @@
                         "column": 15
                       }
                     },
-                    "range": [
-                      11,
-                      15
-                    ],
                     "name": "test"
                   },
                   "kind": "init",
@@ -168,10 +136,6 @@
                         "column": 32
                       }
                     },
-                    "range": [
-                      16,
-                      32
-                    ],
                     "id": null,
                     "generator": true,
                     "expression": false,
@@ -190,10 +154,6 @@
                           "column": 32
                         }
                       },
-                      "range": [
-                        19,
-                        32
-                      ],
                       "body": [
                         {
                           "type": "ExpressionStatement",
@@ -209,10 +169,6 @@
                               "column": 30
                             }
                           },
-                          "range": [
-                            21,
-                            30
-                          ],
                           "expression": {
                             "type": "YieldExpression",
                             "start": 21,
@@ -227,10 +183,6 @@
                                 "column": 29
                               }
                             },
-                            "range": [
-                              21,
-                              29
-                            ],
                             "delegate": true,
                             "argument": {
                               "type": "Identifier",
@@ -246,10 +198,6 @@
                                   "column": 29
                                 }
                               },
-                              "range": [
-                                28,
-                                29
-                              ],
                               "name": "v"
                             }
                           }
@@ -265,5 +213,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/15/expected.json b/test/fixtures/harmony/uncategorised/15/expected.json
index fd5457d090..611801c26d 100644
--- a/test/fixtures/harmony/uncategorised/15/expected.json
+++ b/test/fixtures/harmony/uncategorised/15/expected.json
@@ -12,10 +12,6 @@
       "column": 3
     }
   },
-  "range": [
-    0,
-    3
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 3
       }
     },
-    "range": [
-      0,
-      3
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 3
           }
         },
-        "range": [
-          0,
-          3
-        ],
         "expression": {
           "type": "Literal",
           "start": 0,
@@ -68,15 +56,12 @@
               "column": 3
             }
           },
-          "range": [
-            0,
-            3
-          ],
           "value": 0,
           "rawValue": 0,
           "raw": "0B0"
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/150/expected.json b/test/fixtures/harmony/uncategorised/150/expected.json
index 03d42666e3..8e36dcc558 100644
--- a/test/fixtures/harmony/uncategorised/150/expected.json
+++ b/test/fixtures/harmony/uncategorised/150/expected.json
@@ -12,10 +12,6 @@
       "column": 18
     }
   },
-  "range": [
-    0,
-    18
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 18
       }
     },
-    "range": [
-      0,
-      18
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 18
           }
         },
-        "range": [
-          0,
-          18
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 7
             }
           },
-          "range": [
-            6,
-            7
-          ],
           "name": "A"
         },
         "superClass": null,
@@ -89,10 +73,6 @@
               "column": 18
             }
           },
-          "range": [
-            8,
-            18
-          ],
           "body": [
             {
               "type": "MethodDefinition",
@@ -108,10 +88,6 @@
                   "column": 17
                 }
               },
-              "range": [
-                9,
-                17
-              ],
               "computed": true,
               "key": {
                 "type": "Identifier",
@@ -127,10 +103,6 @@
                     "column": 11
                   }
                 },
-                "range": [
-                  10,
-                  11
-                ],
                 "name": "x"
               },
               "static": false,
@@ -149,10 +121,6 @@
                     "column": 17
                   }
                 },
-                "range": [
-                  12,
-                  17
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -171,10 +139,6 @@
                       "column": 17
                     }
                   },
-                  "range": [
-                    15,
-                    17
-                  ],
                   "body": []
                 }
               }
@@ -183,5 +147,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/152/expected.json b/test/fixtures/harmony/uncategorised/152/expected.json
index f8a12208f0..23d4429400 100644
--- a/test/fixtures/harmony/uncategorised/152/expected.json
+++ b/test/fixtures/harmony/uncategorised/152/expected.json
@@ -12,10 +12,6 @@
       "column": 24
     }
   },
-  "range": [
-    0,
-    24
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 24
       }
     },
-    "range": [
-      0,
-      24
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 24
           }
         },
-        "range": [
-          0,
-          24
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 10
             }
           },
-          "range": [
-            9,
-            10
-          ],
           "name": "f"
         },
         "generator": false,
@@ -91,10 +75,6 @@
                 "column": 20
               }
             },
-            "range": [
-              11,
-              20
-            ],
             "operator": "=",
             "left": {
               "type": "ArrayPattern",
@@ -110,10 +90,6 @@
                   "column": 14
                 }
               },
-              "range": [
-                11,
-                14
-              ],
               "elements": [
                 {
                   "type": "Identifier",
@@ -129,10 +105,6 @@
                       "column": 13
                     }
                   },
-                  "range": [
-                    12,
-                    13
-                  ],
                   "name": "x"
                 }
               ]
@@ -151,10 +123,6 @@
                   "column": 20
                 }
               },
-              "range": [
-                17,
-                20
-              ],
               "elements": [
                 {
                   "type": "Literal",
@@ -170,10 +138,6 @@
                       "column": 19
                     }
                   },
-                  "range": [
-                    18,
-                    19
-                  ],
                   "value": 1,
                   "rawValue": 1,
                   "raw": "1"
@@ -196,13 +160,10 @@
               "column": 24
             }
           },
-          "range": [
-            22,
-            24
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/153/expected.json b/test/fixtures/harmony/uncategorised/153/expected.json
index e39c2aac40..a64f77173c 100644
--- a/test/fixtures/harmony/uncategorised/153/expected.json
+++ b/test/fixtures/harmony/uncategorised/153/expected.json
@@ -12,10 +12,6 @@
       "column": 28
     }
   },
-  "range": [
-    0,
-    28
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 28
       }
     },
-    "range": [
-      0,
-      28
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 28
           }
         },
-        "range": [
-          0,
-          28
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 10
             }
           },
-          "range": [
-            9,
-            10
-          ],
           "name": "f"
         },
         "generator": false,
@@ -91,10 +75,6 @@
                 "column": 24
               }
             },
-            "range": [
-              11,
-              24
-            ],
             "operator": "=",
             "left": {
               "type": "ObjectPattern",
@@ -110,10 +90,6 @@
                   "column": 14
                 }
               },
-              "range": [
-                11,
-                14
-              ],
               "properties": [
                 {
                   "type": "Property",
@@ -129,10 +105,6 @@
                       "column": 13
                     }
                   },
-                  "range": [
-                    12,
-                    13
-                  ],
                   "method": false,
                   "shorthand": true,
                   "computed": false,
@@ -150,10 +122,6 @@
                         "column": 13
                       }
                     },
-                    "range": [
-                      12,
-                      13
-                    ],
                     "name": "x"
                   },
                   "kind": "init",
@@ -171,10 +139,6 @@
                         "column": 13
                       }
                     },
-                    "range": [
-                      12,
-                      13
-                    ],
                     "name": "x"
                   }
                 }
@@ -194,10 +158,6 @@
                   "column": 24
                 }
               },
-              "range": [
-                17,
-                24
-              ],
               "properties": [
                 {
                   "type": "Property",
@@ -213,10 +173,6 @@
                       "column": 23
                     }
                   },
-                  "range": [
-                    18,
-                    23
-                  ],
                   "method": false,
                   "shorthand": false,
                   "computed": false,
@@ -234,10 +190,6 @@
                         "column": 19
                       }
                     },
-                    "range": [
-                      18,
-                      19
-                    ],
                     "name": "x"
                   },
                   "value": {
@@ -254,10 +206,6 @@
                         "column": 23
                       }
                     },
-                    "range": [
-                      21,
-                      23
-                    ],
                     "value": 10,
                     "rawValue": 10,
                     "raw": "10"
@@ -282,13 +230,10 @@
               "column": 28
             }
           },
-          "range": [
-            26,
-            28
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/154/expected.json b/test/fixtures/harmony/uncategorised/154/expected.json
index 6df53df98a..b569d01097 100644
--- a/test/fixtures/harmony/uncategorised/154/expected.json
+++ b/test/fixtures/harmony/uncategorised/154/expected.json
@@ -12,10 +12,6 @@
       "column": 30
     }
   },
-  "range": [
-    0,
-    30
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 30
       }
     },
-    "range": [
-      0,
-      30
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 30
           }
         },
-        "range": [
-          0,
-          30
-        ],
         "expression": {
           "type": "AssignmentExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 30
             }
           },
-          "range": [
-            0,
-            30
-          ],
           "operator": "=",
           "left": {
             "type": "Identifier",
@@ -87,10 +71,6 @@
                 "column": 1
               }
             },
-            "range": [
-              0,
-              1
-            ],
             "name": "f"
           },
           "right": {
@@ -107,10 +87,6 @@
                 "column": 30
               }
             },
-            "range": [
-              4,
-              30
-            ],
             "id": null,
             "generator": false,
             "expression": false,
@@ -129,10 +105,6 @@
                     "column": 26
                   }
                 },
-                "range": [
-                  13,
-                  26
-                ],
                 "operator": "=",
                 "left": {
                   "type": "ObjectPattern",
@@ -148,10 +120,6 @@
                       "column": 16
                     }
                   },
-                  "range": [
-                    13,
-                    16
-                  ],
                   "properties": [
                     {
                       "type": "Property",
@@ -167,10 +135,6 @@
                           "column": 15
                         }
                       },
-                      "range": [
-                        14,
-                        15
-                      ],
                       "method": false,
                       "shorthand": true,
                       "computed": false,
@@ -188,10 +152,6 @@
                             "column": 15
                           }
                         },
-                        "range": [
-                          14,
-                          15
-                        ],
                         "name": "x"
                       },
                       "kind": "init",
@@ -209,10 +169,6 @@
                             "column": 15
                           }
                         },
-                        "range": [
-                          14,
-                          15
-                        ],
                         "name": "x"
                       }
                     }
@@ -232,10 +188,6 @@
                       "column": 26
                     }
                   },
-                  "range": [
-                    19,
-                    26
-                  ],
                   "properties": [
                     {
                       "type": "Property",
@@ -251,10 +203,6 @@
                           "column": 25
                         }
                       },
-                      "range": [
-                        20,
-                        25
-                      ],
                       "method": false,
                       "shorthand": false,
                       "computed": false,
@@ -272,10 +220,6 @@
                             "column": 21
                           }
                         },
-                        "range": [
-                          20,
-                          21
-                        ],
                         "name": "x"
                       },
                       "value": {
@@ -292,10 +236,6 @@
                             "column": 25
                           }
                         },
-                        "range": [
-                          23,
-                          25
-                        ],
                         "value": 10,
                         "rawValue": 10,
                         "raw": "10"
@@ -320,15 +260,12 @@
                   "column": 30
                 }
               },
-              "range": [
-                28,
-                30
-              ],
               "body": []
             }
           }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/155/expected.json b/test/fixtures/harmony/uncategorised/155/expected.json
index 13ab0734ac..c4be10f5a3 100644
--- a/test/fixtures/harmony/uncategorised/155/expected.json
+++ b/test/fixtures/harmony/uncategorised/155/expected.json
@@ -12,10 +12,6 @@
       "column": 33
     }
   },
-  "range": [
-    0,
-    33
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 33
       }
     },
-    "range": [
-      0,
-      33
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 33
           }
         },
-        "range": [
-          0,
-          33
-        ],
         "expression": {
           "type": "ObjectExpression",
           "start": 1,
@@ -68,10 +56,6 @@
               "column": 32
             }
           },
-          "range": [
-            1,
-            32
-          ],
           "properties": [
             {
               "type": "Property",
@@ -87,10 +71,6 @@
                   "column": 31
                 }
               },
-              "range": [
-                2,
-                31
-              ],
               "method": false,
               "shorthand": false,
               "computed": false,
@@ -108,10 +88,6 @@
                     "column": 3
                   }
                 },
-                "range": [
-                  2,
-                  3
-                ],
                 "name": "f"
               },
               "value": {
@@ -128,10 +104,6 @@
                     "column": 31
                   }
                 },
-                "range": [
-                  5,
-                  31
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -150,10 +122,6 @@
                         "column": 27
                       }
                     },
-                    "range": [
-                      14,
-                      27
-                    ],
                     "operator": "=",
                     "left": {
                       "type": "ObjectPattern",
@@ -169,10 +137,6 @@
                           "column": 17
                         }
                       },
-                      "range": [
-                        14,
-                        17
-                      ],
                       "properties": [
                         {
                           "type": "Property",
@@ -188,10 +152,6 @@
                               "column": 16
                             }
                           },
-                          "range": [
-                            15,
-                            16
-                          ],
                           "method": false,
                           "shorthand": true,
                           "computed": false,
@@ -209,10 +169,6 @@
                                 "column": 16
                               }
                             },
-                            "range": [
-                              15,
-                              16
-                            ],
                             "name": "x"
                           },
                           "kind": "init",
@@ -230,10 +186,6 @@
                                 "column": 16
                               }
                             },
-                            "range": [
-                              15,
-                              16
-                            ],
                             "name": "x"
                           }
                         }
@@ -253,10 +205,6 @@
                           "column": 27
                         }
                       },
-                      "range": [
-                        20,
-                        27
-                      ],
                       "properties": [
                         {
                           "type": "Property",
@@ -272,10 +220,6 @@
                               "column": 26
                             }
                           },
-                          "range": [
-                            21,
-                            26
-                          ],
                           "method": false,
                           "shorthand": false,
                           "computed": false,
@@ -293,10 +237,6 @@
                                 "column": 22
                               }
                             },
-                            "range": [
-                              21,
-                              22
-                            ],
                             "name": "x"
                           },
                           "value": {
@@ -313,10 +253,6 @@
                                 "column": 26
                               }
                             },
-                            "range": [
-                              24,
-                              26
-                            ],
                             "value": 10,
                             "rawValue": 10,
                             "raw": "10"
@@ -341,10 +277,6 @@
                       "column": 31
                     }
                   },
-                  "range": [
-                    29,
-                    31
-                  ],
                   "body": []
                 }
               },
@@ -355,5 +287,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/156/expected.json b/test/fixtures/harmony/uncategorised/156/expected.json
index 6b26760b30..c724ba84e8 100644
--- a/test/fixtures/harmony/uncategorised/156/expected.json
+++ b/test/fixtures/harmony/uncategorised/156/expected.json
@@ -12,10 +12,6 @@
       "column": 23
     }
   },
-  "range": [
-    0,
-    23
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 23
       }
     },
-    "range": [
-      0,
-      23
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 23
           }
         },
-        "range": [
-          0,
-          23
-        ],
         "expression": {
           "type": "ObjectExpression",
           "start": 1,
@@ -68,10 +56,6 @@
               "column": 22
             }
           },
-          "range": [
-            1,
-            22
-          ],
           "properties": [
             {
               "type": "Property",
@@ -87,10 +71,6 @@
                   "column": 21
                 }
               },
-              "range": [
-                2,
-                21
-              ],
               "method": true,
               "shorthand": false,
               "computed": false,
@@ -108,10 +88,6 @@
                     "column": 3
                   }
                 },
-                "range": [
-                  2,
-                  3
-                ],
                 "name": "f"
               },
               "kind": "init",
@@ -129,10 +105,6 @@
                     "column": 21
                   }
                 },
-                "range": [
-                  3,
-                  21
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -151,10 +123,6 @@
                         "column": 17
                       }
                     },
-                    "range": [
-                      4,
-                      17
-                    ],
                     "operator": "=",
                     "left": {
                       "type": "ObjectPattern",
@@ -170,10 +138,6 @@
                           "column": 7
                         }
                       },
-                      "range": [
-                        4,
-                        7
-                      ],
                       "properties": [
                         {
                           "type": "Property",
@@ -189,10 +153,6 @@
                               "column": 6
                             }
                           },
-                          "range": [
-                            5,
-                            6
-                          ],
                           "method": false,
                           "shorthand": true,
                           "computed": false,
@@ -210,10 +170,6 @@
                                 "column": 6
                               }
                             },
-                            "range": [
-                              5,
-                              6
-                            ],
                             "name": "x"
                           },
                           "kind": "init",
@@ -231,10 +187,6 @@
                                 "column": 6
                               }
                             },
-                            "range": [
-                              5,
-                              6
-                            ],
                             "name": "x"
                           }
                         }
@@ -254,10 +206,6 @@
                           "column": 17
                         }
                       },
-                      "range": [
-                        10,
-                        17
-                      ],
                       "properties": [
                         {
                           "type": "Property",
@@ -273,10 +221,6 @@
                               "column": 16
                             }
                           },
-                          "range": [
-                            11,
-                            16
-                          ],
                           "method": false,
                           "shorthand": false,
                           "computed": false,
@@ -294,10 +238,6 @@
                                 "column": 12
                               }
                             },
-                            "range": [
-                              11,
-                              12
-                            ],
                             "name": "x"
                           },
                           "value": {
@@ -314,10 +254,6 @@
                                 "column": 16
                               }
                             },
-                            "range": [
-                              14,
-                              16
-                            ],
                             "value": 10,
                             "rawValue": 10,
                             "raw": "10"
@@ -342,10 +278,6 @@
                       "column": 21
                     }
                   },
-                  "range": [
-                    19,
-                    21
-                  ],
                   "body": []
                 }
               }
@@ -355,5 +287,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/157/expected.json b/test/fixtures/harmony/uncategorised/157/expected.json
index bd1dc26f73..4b8376ff69 100644
--- a/test/fixtures/harmony/uncategorised/157/expected.json
+++ b/test/fixtures/harmony/uncategorised/157/expected.json
@@ -12,10 +12,6 @@
       "column": 29
     }
   },
-  "range": [
-    0,
-    29
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 29
       }
     },
-    "range": [
-      0,
-      29
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 29
           }
         },
-        "range": [
-          0,
-          29
-        ],
         "expression": {
           "type": "ClassExpression",
           "start": 1,
@@ -68,10 +56,6 @@
               "column": 28
             }
           },
-          "range": [
-            1,
-            28
-          ],
           "id": null,
           "superClass": null,
           "body": {
@@ -88,10 +72,6 @@
                 "column": 28
               }
             },
-            "range": [
-              7,
-              28
-            ],
             "body": [
               {
                 "type": "MethodDefinition",
@@ -107,10 +87,6 @@
                     "column": 27
                   }
                 },
-                "range": [
-                  8,
-                  27
-                ],
                 "computed": false,
                 "key": {
                   "type": "Identifier",
@@ -126,10 +102,6 @@
                       "column": 9
                     }
                   },
-                  "range": [
-                    8,
-                    9
-                  ],
                   "name": "f"
                 },
                 "static": false,
@@ -148,10 +120,6 @@
                       "column": 27
                     }
                   },
-                  "range": [
-                    9,
-                    27
-                  ],
                   "id": null,
                   "generator": false,
                   "expression": false,
@@ -170,10 +138,6 @@
                           "column": 23
                         }
                       },
-                      "range": [
-                        10,
-                        23
-                      ],
                       "operator": "=",
                       "left": {
                         "type": "ObjectPattern",
@@ -189,10 +153,6 @@
                             "column": 13
                           }
                         },
-                        "range": [
-                          10,
-                          13
-                        ],
                         "properties": [
                           {
                             "type": "Property",
@@ -208,10 +168,6 @@
                                 "column": 12
                               }
                             },
-                            "range": [
-                              11,
-                              12
-                            ],
                             "method": false,
                             "shorthand": true,
                             "computed": false,
@@ -229,10 +185,6 @@
                                   "column": 12
                                 }
                               },
-                              "range": [
-                                11,
-                                12
-                              ],
                               "name": "x"
                             },
                             "kind": "init",
@@ -250,10 +202,6 @@
                                   "column": 12
                                 }
                               },
-                              "range": [
-                                11,
-                                12
-                              ],
                               "name": "x"
                             }
                           }
@@ -273,10 +221,6 @@
                             "column": 23
                           }
                         },
-                        "range": [
-                          16,
-                          23
-                        ],
                         "properties": [
                           {
                             "type": "Property",
@@ -292,10 +236,6 @@
                                 "column": 22
                               }
                             },
-                            "range": [
-                              17,
-                              22
-                            ],
                             "method": false,
                             "shorthand": false,
                             "computed": false,
@@ -313,10 +253,6 @@
                                   "column": 18
                                 }
                               },
-                              "range": [
-                                17,
-                                18
-                              ],
                               "name": "x"
                             },
                             "value": {
@@ -333,10 +269,6 @@
                                   "column": 22
                                 }
                               },
-                              "range": [
-                                20,
-                                22
-                              ],
                               "value": 10,
                               "rawValue": 10,
                               "raw": "10"
@@ -361,10 +293,6 @@
                         "column": 27
                       }
                     },
-                    "range": [
-                      25,
-                      27
-                    ],
                     "body": []
                   }
                 }
@@ -375,5 +303,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/158/expected.json b/test/fixtures/harmony/uncategorised/158/expected.json
index a124117bff..eef638df4a 100644
--- a/test/fixtures/harmony/uncategorised/158/expected.json
+++ b/test/fixtures/harmony/uncategorised/158/expected.json
@@ -12,10 +12,6 @@
       "column": 23
     }
   },
-  "range": [
-    0,
-    23
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 23
       }
     },
-    "range": [
-      0,
-      23
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 23
           }
         },
-        "range": [
-          0,
-          23
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 1,
@@ -68,10 +56,6 @@
               "column": 22
             }
           },
-          "range": [
-            1,
-            22
-          ],
           "id": null,
           "generator": false,
           "expression": false,
@@ -90,10 +74,6 @@
                   "column": 15
                 }
               },
-              "range": [
-                2,
-                15
-              ],
               "left": {
                 "type": "ObjectPattern",
                 "start": 2,
@@ -108,10 +88,6 @@
                     "column": 5
                   }
                 },
-                "range": [
-                  2,
-                  5
-                ],
                 "properties": [
                   {
                     "type": "Property",
@@ -127,10 +103,6 @@
                         "column": 4
                       }
                     },
-                    "range": [
-                      3,
-                      4
-                    ],
                     "method": false,
                     "shorthand": true,
                     "computed": false,
@@ -148,10 +120,6 @@
                           "column": 4
                         }
                       },
-                      "range": [
-                        3,
-                        4
-                      ],
                       "name": "x"
                     },
                     "kind": "init",
@@ -169,10 +137,6 @@
                           "column": 4
                         }
                       },
-                      "range": [
-                        3,
-                        4
-                      ],
                       "name": "x"
                     }
                   }
@@ -192,10 +156,6 @@
                     "column": 15
                   }
                 },
-                "range": [
-                  8,
-                  15
-                ],
                 "properties": [
                   {
                     "type": "Property",
@@ -211,10 +171,6 @@
                         "column": 14
                       }
                     },
-                    "range": [
-                      9,
-                      14
-                    ],
                     "method": false,
                     "shorthand": false,
                     "computed": false,
@@ -232,10 +188,6 @@
                           "column": 10
                         }
                       },
-                      "range": [
-                        9,
-                        10
-                      ],
                       "name": "x"
                     },
                     "value": {
@@ -252,10 +204,6 @@
                           "column": 14
                         }
                       },
-                      "range": [
-                        12,
-                        14
-                      ],
                       "value": 10,
                       "rawValue": 10,
                       "raw": "10"
@@ -280,15 +228,12 @@
                 "column": 22
               }
             },
-            "range": [
-              20,
-              22
-            ],
             "body": []
           },
           "parenthesizedExpression": true
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/159/expected.json b/test/fixtures/harmony/uncategorised/159/expected.json
index 8e260d0421..a30c8b7a8e 100644
--- a/test/fixtures/harmony/uncategorised/159/expected.json
+++ b/test/fixtures/harmony/uncategorised/159/expected.json
@@ -12,10 +12,6 @@
       "column": 22
     }
   },
-  "range": [
-    0,
-    22
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 22
       }
     },
-    "range": [
-      0,
-      22
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 22
           }
         },
-        "range": [
-          0,
-          22
-        ],
         "expression": {
           "type": "AssignmentExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 22
             }
           },
-          "range": [
-            0,
-            22
-          ],
           "operator": "=",
           "left": {
             "type": "Identifier",
@@ -87,10 +71,6 @@
                 "column": 1
               }
             },
-            "range": [
-              0,
-              1
-            ],
             "name": "x"
           },
           "right": {
@@ -107,10 +87,6 @@
                 "column": 22
               }
             },
-            "range": [
-              4,
-              22
-            ],
             "id": null,
             "generator": false,
             "expression": false,
@@ -129,10 +105,6 @@
                     "column": 18
                   }
                 },
-                "range": [
-                  13,
-                  18
-                ],
                 "operator": "=",
                 "left": {
                   "type": "Identifier",
@@ -148,10 +120,6 @@
                       "column": 14
                     }
                   },
-                  "range": [
-                    13,
-                    14
-                  ],
                   "name": "y"
                 },
                 "right": {
@@ -168,10 +136,6 @@
                       "column": 18
                     }
                   },
-                  "range": [
-                    17,
-                    18
-                  ],
                   "value": 1,
                   "rawValue": 1,
                   "raw": "1"
@@ -192,15 +156,12 @@
                   "column": 22
                 }
               },
-              "range": [
-                20,
-                22
-              ],
               "body": []
             }
           }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/16/expected.json b/test/fixtures/harmony/uncategorised/16/expected.json
index 719347ca54..112c7f0752 100644
--- a/test/fixtures/harmony/uncategorised/16/expected.json
+++ b/test/fixtures/harmony/uncategorised/16/expected.json
@@ -12,10 +12,6 @@
       "column": 3
     }
   },
-  "range": [
-    0,
-    3
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 3
       }
     },
-    "range": [
-      0,
-      3
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 3
           }
         },
-        "range": [
-          0,
-          3
-        ],
         "expression": {
           "type": "Literal",
           "start": 0,
@@ -68,15 +56,12 @@
               "column": 3
             }
           },
-          "range": [
-            0,
-            3
-          ],
           "value": 1,
           "rawValue": 1,
           "raw": "0B1"
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/160/expected.json b/test/fixtures/harmony/uncategorised/160/expected.json
index a4414c951e..388179a9da 100644
--- a/test/fixtures/harmony/uncategorised/160/expected.json
+++ b/test/fixtures/harmony/uncategorised/160/expected.json
@@ -12,10 +12,6 @@
       "column": 20
     }
   },
-  "range": [
-    0,
-    20
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 20
       }
     },
-    "range": [
-      0,
-      20
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 20
           }
         },
-        "range": [
-          0,
-          20
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 10
             }
           },
-          "range": [
-            9,
-            10
-          ],
           "name": "f"
         },
         "generator": false,
@@ -91,10 +75,6 @@
                 "column": 16
               }
             },
-            "range": [
-              11,
-              16
-            ],
             "operator": "=",
             "left": {
               "type": "Identifier",
@@ -110,10 +90,6 @@
                   "column": 12
                 }
               },
-              "range": [
-                11,
-                12
-              ],
               "name": "a"
             },
             "right": {
@@ -130,10 +106,6 @@
                   "column": 16
                 }
               },
-              "range": [
-                15,
-                16
-              ],
               "value": 1,
               "rawValue": 1,
               "raw": "1"
@@ -154,13 +126,10 @@
               "column": 20
             }
           },
-          "range": [
-            18,
-            20
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/161/expected.json b/test/fixtures/harmony/uncategorised/161/expected.json
index d288d68e93..44bf75a551 100644
--- a/test/fixtures/harmony/uncategorised/161/expected.json
+++ b/test/fixtures/harmony/uncategorised/161/expected.json
@@ -12,10 +12,6 @@
       "column": 27
     }
   },
-  "range": [
-    0,
-    27
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 27
       }
     },
-    "range": [
-      0,
-      27
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 27
           }
         },
-        "range": [
-          0,
-          27
-        ],
         "expression": {
           "type": "AssignmentExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 27
             }
           },
-          "range": [
-            0,
-            27
-          ],
           "operator": "=",
           "left": {
             "type": "Identifier",
@@ -87,10 +71,6 @@
                 "column": 1
               }
             },
-            "range": [
-              0,
-              1
-            ],
             "name": "x"
           },
           "right": {
@@ -107,10 +87,6 @@
                 "column": 27
               }
             },
-            "range": [
-              4,
-              27
-            ],
             "properties": [
               {
                 "type": "Property",
@@ -126,10 +102,6 @@
                     "column": 25
                   }
                 },
-                "range": [
-                  6,
-                  25
-                ],
                 "method": false,
                 "shorthand": false,
                 "computed": false,
@@ -147,10 +119,6 @@
                       "column": 7
                     }
                   },
-                  "range": [
-                    6,
-                    7
-                  ],
                   "name": "f"
                 },
                 "value": {
@@ -167,10 +135,6 @@
                       "column": 25
                     }
                   },
-                  "range": [
-                    9,
-                    25
-                  ],
                   "id": null,
                   "generator": false,
                   "expression": false,
@@ -189,10 +153,6 @@
                           "column": 21
                         }
                       },
-                      "range": [
-                        18,
-                        21
-                      ],
                       "operator": "=",
                       "left": {
                         "type": "Identifier",
@@ -208,10 +168,6 @@
                             "column": 19
                           }
                         },
-                        "range": [
-                          18,
-                          19
-                        ],
                         "name": "a"
                       },
                       "right": {
@@ -228,10 +184,6 @@
                             "column": 21
                           }
                         },
-                        "range": [
-                          20,
-                          21
-                        ],
                         "value": 1,
                         "rawValue": 1,
                         "raw": "1"
@@ -252,10 +204,6 @@
                         "column": 25
                       }
                     },
-                    "range": [
-                      23,
-                      25
-                    ],
                     "body": []
                   }
                 },
@@ -266,5 +214,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/162/expected.json b/test/fixtures/harmony/uncategorised/162/expected.json
index c877b1aeba..bc6aa6ab7d 100644
--- a/test/fixtures/harmony/uncategorised/162/expected.json
+++ b/test/fixtures/harmony/uncategorised/162/expected.json
@@ -12,10 +12,6 @@
       "column": 17
     }
   },
-  "range": [
-    0,
-    17
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 17
       }
     },
-    "range": [
-      0,
-      17
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 17
           }
         },
-        "range": [
-          0,
-          17
-        ],
         "expression": {
           "type": "AssignmentExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 17
             }
           },
-          "range": [
-            0,
-            17
-          ],
           "operator": "=",
           "left": {
             "type": "Identifier",
@@ -87,10 +71,6 @@
                 "column": 1
               }
             },
-            "range": [
-              0,
-              1
-            ],
             "name": "x"
           },
           "right": {
@@ -107,10 +87,6 @@
                 "column": 17
               }
             },
-            "range": [
-              4,
-              17
-            ],
             "properties": [
               {
                 "type": "Property",
@@ -126,10 +102,6 @@
                     "column": 15
                   }
                 },
-                "range": [
-                  6,
-                  15
-                ],
                 "method": true,
                 "shorthand": false,
                 "computed": false,
@@ -147,10 +119,6 @@
                       "column": 7
                     }
                   },
-                  "range": [
-                    6,
-                    7
-                  ],
                   "name": "f"
                 },
                 "kind": "init",
@@ -168,10 +136,6 @@
                       "column": 15
                     }
                   },
-                  "range": [
-                    7,
-                    15
-                  ],
                   "id": null,
                   "generator": false,
                   "expression": false,
@@ -190,10 +154,6 @@
                           "column": 11
                         }
                       },
-                      "range": [
-                        8,
-                        11
-                      ],
                       "operator": "=",
                       "left": {
                         "type": "Identifier",
@@ -209,10 +169,6 @@
                             "column": 9
                           }
                         },
-                        "range": [
-                          8,
-                          9
-                        ],
                         "name": "a"
                       },
                       "right": {
@@ -229,10 +185,6 @@
                             "column": 11
                           }
                         },
-                        "range": [
-                          10,
-                          11
-                        ],
                         "value": 1,
                         "rawValue": 1,
                         "raw": "1"
@@ -253,10 +205,6 @@
                         "column": 15
                       }
                     },
-                    "range": [
-                      13,
-                      15
-                    ],
                     "body": []
                   }
                 }
@@ -266,5 +214,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/163/expected.json b/test/fixtures/harmony/uncategorised/163/expected.json
index 3fd0ffe939..ec815ca77b 100644
--- a/test/fixtures/harmony/uncategorised/163/expected.json
+++ b/test/fixtures/harmony/uncategorised/163/expected.json
@@ -12,10 +12,6 @@
       "column": 22
     }
   },
-  "range": [
-    0,
-    22
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 22
       }
     },
-    "range": [
-      0,
-      22
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 22
           }
         },
-        "range": [
-          0,
-          22
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 10
             }
           },
-          "range": [
-            9,
-            10
-          ],
           "name": "f"
         },
         "generator": false,
@@ -91,10 +75,6 @@
                 "column": 12
               }
             },
-            "range": [
-              11,
-              12
-            ],
             "name": "a"
           },
           {
@@ -111,10 +91,6 @@
                 "column": 18
               }
             },
-            "range": [
-              14,
-              18
-            ],
             "argument": {
               "type": "Identifier",
               "start": 17,
@@ -129,10 +105,6 @@
                   "column": 18
                 }
               },
-              "range": [
-                17,
-                18
-              ],
               "name": "b"
             }
           }
@@ -151,13 +123,10 @@
               "column": 22
             }
           },
-          "range": [
-            20,
-            22
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/164/expected.json b/test/fixtures/harmony/uncategorised/164/expected.json
index 53bc251508..6cf3d81740 100644
--- a/test/fixtures/harmony/uncategorised/164/expected.json
+++ b/test/fixtures/harmony/uncategorised/164/expected.json
@@ -12,10 +12,6 @@
       "column": 22
     }
   },
-  "range": [
-    0,
-    22
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 22
       }
     },
-    "range": [
-      0,
-      22
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 22
           }
         },
-        "range": [
-          0,
-          22
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 10
             }
           },
-          "range": [
-            9,
-            10
-          ],
           "name": "x"
         },
         "generator": false,
@@ -91,10 +75,6 @@
                 "column": 19
               }
             },
-            "range": [
-              11,
-              19
-            ],
             "elements": [
               {
                 "type": "Identifier",
@@ -110,10 +90,6 @@
                     "column": 14
                   }
                 },
-                "range": [
-                  13,
-                  14
-                ],
                 "name": "a"
               },
               {
@@ -130,10 +106,6 @@
                     "column": 17
                   }
                 },
-                "range": [
-                  16,
-                  17
-                ],
                 "name": "b"
               }
             ]
@@ -153,13 +125,10 @@
               "column": 22
             }
           },
-          "range": [
-            20,
-            22
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/165/expected.json b/test/fixtures/harmony/uncategorised/165/expected.json
index 0a717add26..4ba45288ad 100644
--- a/test/fixtures/harmony/uncategorised/165/expected.json
+++ b/test/fixtures/harmony/uncategorised/165/expected.json
@@ -12,10 +12,6 @@
       "column": 22
     }
   },
-  "range": [
-    0,
-    22
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 22
       }
     },
-    "range": [
-      0,
-      22
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 22
           }
         },
-        "range": [
-          0,
-          22
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 10
             }
           },
-          "range": [
-            9,
-            10
-          ],
           "name": "x"
         },
         "generator": false,
@@ -91,10 +75,6 @@
                 "column": 19
               }
             },
-            "range": [
-              11,
-              19
-            ],
             "properties": [
               {
                 "type": "Property",
@@ -110,10 +90,6 @@
                     "column": 14
                   }
                 },
-                "range": [
-                  13,
-                  14
-                ],
                 "method": false,
                 "shorthand": true,
                 "computed": false,
@@ -131,10 +107,6 @@
                       "column": 14
                     }
                   },
-                  "range": [
-                    13,
-                    14
-                  ],
                   "name": "a"
                 },
                 "kind": "init",
@@ -152,10 +124,6 @@
                       "column": 14
                     }
                   },
-                  "range": [
-                    13,
-                    14
-                  ],
                   "name": "a"
                 }
               },
@@ -173,10 +141,6 @@
                     "column": 17
                   }
                 },
-                "range": [
-                  16,
-                  17
-                ],
                 "method": false,
                 "shorthand": true,
                 "computed": false,
@@ -194,10 +158,6 @@
                       "column": 17
                     }
                   },
-                  "range": [
-                    16,
-                    17
-                  ],
                   "name": "b"
                 },
                 "kind": "init",
@@ -215,10 +175,6 @@
                       "column": 17
                     }
                   },
-                  "range": [
-                    16,
-                    17
-                  ],
                   "name": "b"
                 }
               }
@@ -239,13 +195,10 @@
               "column": 22
             }
           },
-          "range": [
-            20,
-            22
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/166/expected.json b/test/fixtures/harmony/uncategorised/166/expected.json
index 6ba4d3b304..65c064b712 100644
--- a/test/fixtures/harmony/uncategorised/166/expected.json
+++ b/test/fixtures/harmony/uncategorised/166/expected.json
@@ -12,10 +12,6 @@
       "column": 22
     }
   },
-  "range": [
-    0,
-    22
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 22
       }
     },
-    "range": [
-      0,
-      22
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 22
           }
         },
-        "range": [
-          0,
-          22
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 10
             }
           },
-          "range": [
-            9,
-            10
-          ],
           "name": "x"
         },
         "generator": false,
@@ -91,10 +75,6 @@
                 "column": 12
               }
             },
-            "range": [
-              11,
-              12
-            ],
             "name": "a"
           },
           {
@@ -111,10 +91,6 @@
                 "column": 19
               }
             },
-            "range": [
-              14,
-              19
-            ],
             "properties": [
               {
                 "type": "Property",
@@ -130,10 +106,6 @@
                     "column": 17
                   }
                 },
-                "range": [
-                  16,
-                  17
-                ],
                 "method": false,
                 "shorthand": true,
                 "computed": false,
@@ -151,10 +123,6 @@
                       "column": 17
                     }
                   },
-                  "range": [
-                    16,
-                    17
-                  ],
                   "name": "a"
                 },
                 "kind": "init",
@@ -172,10 +140,6 @@
                       "column": 17
                     }
                   },
-                  "range": [
-                    16,
-                    17
-                  ],
                   "name": "a"
                 }
               }
@@ -196,13 +160,10 @@
               "column": 22
             }
           },
-          "range": [
-            20,
-            22
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/167/expected.json b/test/fixtures/harmony/uncategorised/167/expected.json
index 323d98eb0b..b0298f2072 100644
--- a/test/fixtures/harmony/uncategorised/167/expected.json
+++ b/test/fixtures/harmony/uncategorised/167/expected.json
@@ -12,10 +12,6 @@
       "column": 25
     }
   },
-  "range": [
-    0,
-    25
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 25
       }
     },
-    "range": [
-      0,
-      25
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 25
           }
         },
-        "range": [
-          0,
-          25
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 10
             }
           },
-          "range": [
-            9,
-            10
-          ],
           "name": "x"
         },
         "generator": false,
@@ -91,10 +75,6 @@
                 "column": 22
               }
             },
-            "range": [
-              11,
-              22
-            ],
             "argument": {
               "type": "ArrayPattern",
               "start": 14,
@@ -109,10 +89,6 @@
                   "column": 22
                 }
               },
-              "range": [
-                14,
-                22
-              ],
               "elements": [
                 {
                   "type": "Identifier",
@@ -128,10 +104,6 @@
                       "column": 17
                     }
                   },
-                  "range": [
-                    16,
-                    17
-                  ],
                   "name": "a"
                 },
                 {
@@ -148,10 +120,6 @@
                       "column": 20
                     }
                   },
-                  "range": [
-                    19,
-                    20
-                  ],
                   "name": "b"
                 }
               ]
@@ -172,13 +140,10 @@
               "column": 25
             }
           },
-          "range": [
-            23,
-            25
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/168/expected.json b/test/fixtures/harmony/uncategorised/168/expected.json
index 10fcca3c4d..b07fc54644 100644
--- a/test/fixtures/harmony/uncategorised/168/expected.json
+++ b/test/fixtures/harmony/uncategorised/168/expected.json
@@ -12,10 +12,6 @@
       "column": 54
     }
   },
-  "range": [
-    0,
-    54
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 54
       }
     },
-    "range": [
-      0,
-      54
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 54
           }
         },
-        "range": [
-          0,
-          54
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 10
             }
           },
-          "range": [
-            9,
-            10
-          ],
           "name": "x"
         },
         "generator": false,
@@ -91,10 +75,6 @@
                 "column": 37
               }
             },
-            "range": [
-              11,
-              37
-            ],
             "properties": [
               {
                 "type": "Property",
@@ -110,10 +90,6 @@
                     "column": 24
                   }
                 },
-                "range": [
-                  13,
-                  24
-                ],
                 "method": false,
                 "shorthand": false,
                 "computed": false,
@@ -131,10 +107,6 @@
                       "column": 14
                     }
                   },
-                  "range": [
-                    13,
-                    14
-                  ],
                   "name": "a"
                 },
                 "value": {
@@ -151,10 +123,6 @@
                       "column": 24
                     }
                   },
-                  "range": [
-                    16,
-                    24
-                  ],
                   "properties": [
                     {
                       "type": "Property",
@@ -170,10 +138,6 @@
                           "column": 19
                         }
                       },
-                      "range": [
-                        18,
-                        19
-                      ],
                       "method": false,
                       "shorthand": true,
                       "computed": false,
@@ -191,10 +155,6 @@
                             "column": 19
                           }
                         },
-                        "range": [
-                          18,
-                          19
-                        ],
                         "name": "w"
                       },
                       "kind": "init",
@@ -212,10 +172,6 @@
                             "column": 19
                           }
                         },
-                        "range": [
-                          18,
-                          19
-                        ],
                         "name": "w"
                       }
                     },
@@ -233,10 +189,6 @@
                           "column": 22
                         }
                       },
-                      "range": [
-                        21,
-                        22
-                      ],
                       "method": false,
                       "shorthand": true,
                       "computed": false,
@@ -254,10 +206,6 @@
                             "column": 22
                           }
                         },
-                        "range": [
-                          21,
-                          22
-                        ],
                         "name": "x"
                       },
                       "kind": "init",
@@ -275,10 +223,6 @@
                             "column": 22
                           }
                         },
-                        "range": [
-                          21,
-                          22
-                        ],
                         "name": "x"
                       }
                     }
@@ -300,10 +244,6 @@
                     "column": 35
                   }
                 },
-                "range": [
-                  26,
-                  35
-                ],
                 "method": false,
                 "shorthand": false,
                 "computed": false,
@@ -321,10 +261,6 @@
                       "column": 27
                     }
                   },
-                  "range": [
-                    26,
-                    27
-                  ],
                   "name": "b"
                 },
                 "value": {
@@ -341,10 +277,6 @@
                       "column": 35
                     }
                   },
-                  "range": [
-                    29,
-                    35
-                  ],
                   "elements": [
                     {
                       "type": "Identifier",
@@ -360,10 +292,6 @@
                           "column": 31
                         }
                       },
-                      "range": [
-                        30,
-                        31
-                      ],
                       "name": "y"
                     },
                     {
@@ -380,10 +308,6 @@
                           "column": 34
                         }
                       },
-                      "range": [
-                        33,
-                        34
-                      ],
                       "name": "z"
                     }
                   ]
@@ -406,10 +330,6 @@
                 "column": 51
               }
             },
-            "range": [
-              39,
-              51
-            ],
             "argument": {
               "type": "ArrayPattern",
               "start": 42,
@@ -424,10 +344,6 @@
                   "column": 51
                 }
               },
-              "range": [
-                42,
-                51
-              ],
               "elements": [
                 {
                   "type": "Identifier",
@@ -443,10 +359,6 @@
                       "column": 44
                     }
                   },
-                  "range": [
-                    43,
-                    44
-                  ],
                   "name": "a"
                 },
                 {
@@ -463,10 +375,6 @@
                       "column": 47
                     }
                   },
-                  "range": [
-                    46,
-                    47
-                  ],
                   "name": "b"
                 },
                 {
@@ -483,10 +391,6 @@
                       "column": 50
                     }
                   },
-                  "range": [
-                    49,
-                    50
-                  ],
                   "name": "c"
                 }
               ]
@@ -507,13 +411,10 @@
               "column": 54
             }
           },
-          "range": [
-            52,
-            54
-          ],
           "body": []
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/169/expected.json b/test/fixtures/harmony/uncategorised/169/expected.json
index c9508e73fd..79ea543bbe 100644
--- a/test/fixtures/harmony/uncategorised/169/expected.json
+++ b/test/fixtures/harmony/uncategorised/169/expected.json
@@ -12,10 +12,6 @@
       "column": 24
     }
   },
-  "range": [
-    0,
-    24
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 24
       }
     },
-    "range": [
-      0,
-      24
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 24
           }
         },
-        "range": [
-          0,
-          24
-        ],
         "expression": {
           "type": "FunctionExpression",
           "start": 1,
@@ -68,10 +56,6 @@
               "column": 23
             }
           },
-          "range": [
-            1,
-            23
-          ],
           "id": {
             "type": "Identifier",
             "start": 10,
@@ -86,10 +70,6 @@
                 "column": 11
               }
             },
-            "range": [
-              10,
-              11
-            ],
             "name": "x"
           },
           "generator": false,
@@ -109,10 +89,6 @@
                   "column": 20
                 }
               },
-              "range": [
-                12,
-                20
-              ],
               "elements": [
                 {
                   "type": "Identifier",
@@ -128,10 +104,6 @@
                       "column": 15
                     }
                   },
-                  "range": [
-                    14,
-                    15
-                  ],
                   "name": "a"
                 },
                 {
@@ -148,10 +120,6 @@
                       "column": 18
                     }
                   },
-                  "range": [
-                    17,
-                    18
-                  ],
                   "name": "b"
                 }
               ]
@@ -171,15 +139,12 @@
                 "column": 23
               }
             },
-            "range": [
-              21,
-              23
-            ],
             "body": []
           },
           "parenthesizedExpression": true
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/17/expected.json b/test/fixtures/harmony/uncategorised/17/expected.json
index 42faeec56c..5c09cfb02a 100644
--- a/test/fixtures/harmony/uncategorised/17/expected.json
+++ b/test/fixtures/harmony/uncategorised/17/expected.json
@@ -12,10 +12,6 @@
       "column": 4
     }
   },
-  "range": [
-    0,
-    4
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 4
       }
     },
-    "range": [
-      0,
-      4
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 4
           }
         },
-        "range": [
-          0,
-          4
-        ],
         "expression": {
           "type": "Literal",
           "start": 0,
@@ -68,15 +56,12 @@
               "column": 4
             }
           },
-          "range": [
-            0,
-            4
-          ],
           "value": 2,
           "rawValue": 2,
           "raw": "0B10"
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/170/expected.json b/test/fixtures/harmony/uncategorised/170/expected.json
index 2ea57a34bf..438f7a1d90 100644
--- a/test/fixtures/harmony/uncategorised/170/expected.json
+++ b/test/fixtures/harmony/uncategorised/170/expected.json
@@ -12,10 +12,6 @@
       "column": 24
     }
   },
-  "range": [
-    0,
-    24
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 24
       }
     },
-    "range": [
-      0,
-      24
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 24
           }
         },
-        "range": [
-          0,
-          24
-        ],
         "expression": {
           "type": "FunctionExpression",
           "start": 1,
@@ -68,10 +56,6 @@
               "column": 23
             }
           },
-          "range": [
-            1,
-            23
-          ],
           "id": {
             "type": "Identifier",
             "start": 10,
@@ -86,10 +70,6 @@
                 "column": 11
               }
             },
-            "range": [
-              10,
-              11
-            ],
             "name": "x"
           },
           "generator": false,
@@ -109,10 +89,6 @@
                   "column": 20
                 }
               },
-              "range": [
-                12,
-                20
-              ],
               "properties": [
                 {
                   "type": "Property",
@@ -128,10 +104,6 @@
                       "column": 15
                     }
                   },
-                  "range": [
-                    14,
-                    15
-                  ],
                   "method": false,
                   "shorthand": true,
                   "computed": false,
@@ -149,10 +121,6 @@
                         "column": 15
                       }
                     },
-                    "range": [
-                      14,
-                      15
-                    ],
                     "name": "a"
                   },
                   "kind": "init",
@@ -170,10 +138,6 @@
                         "column": 15
                       }
                     },
-                    "range": [
-                      14,
-                      15
-                    ],
                     "name": "a"
                   }
                 },
@@ -191,10 +155,6 @@
                       "column": 18
                     }
                   },
-                  "range": [
-                    17,
-                    18
-                  ],
                   "method": false,
                   "shorthand": true,
                   "computed": false,
@@ -212,10 +172,6 @@
                         "column": 18
                       }
                     },
-                    "range": [
-                      17,
-                      18
-                    ],
                     "name": "b"
                   },
                   "kind": "init",
@@ -233,10 +189,6 @@
                         "column": 18
                       }
                     },
-                    "range": [
-                      17,
-                      18
-                    ],
                     "name": "b"
                   }
                 }
@@ -257,15 +209,12 @@
                 "column": 23
               }
             },
-            "range": [
-              21,
-              23
-            ],
             "body": []
           },
           "parenthesizedExpression": true
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/171/expected.json b/test/fixtures/harmony/uncategorised/171/expected.json
index c26272226a..834acd8bfe 100644
--- a/test/fixtures/harmony/uncategorised/171/expected.json
+++ b/test/fixtures/harmony/uncategorised/171/expected.json
@@ -12,10 +12,6 @@
       "column": 27
     }
   },
-  "range": [
-    0,
-    27
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 27
       }
     },
-    "range": [
-      0,
-      27
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 27
           }
         },
-        "range": [
-          0,
-          27
-        ],
         "expression": {
           "type": "FunctionExpression",
           "start": 1,
@@ -68,10 +56,6 @@
               "column": 26
             }
           },
-          "range": [
-            1,
-            26
-          ],
           "id": {
             "type": "Identifier",
             "start": 10,
@@ -86,10 +70,6 @@
                 "column": 11
               }
             },
-            "range": [
-              10,
-              11
-            ],
             "name": "x"
           },
           "generator": false,
@@ -109,10 +89,6 @@
                   "column": 23
                 }
               },
-              "range": [
-                12,
-                23
-              ],
               "argument": {
                 "type": "ArrayPattern",
                 "start": 15,
@@ -127,10 +103,6 @@
                     "column": 23
                   }
                 },
-                "range": [
-                  15,
-                  23
-                ],
                 "elements": [
                   {
                     "type": "Identifier",
@@ -146,10 +118,6 @@
                         "column": 18
                       }
                     },
-                    "range": [
-                      17,
-                      18
-                    ],
                     "name": "a"
                   },
                   {
@@ -166,10 +134,6 @@
                         "column": 21
                       }
                     },
-                    "range": [
-                      20,
-                      21
-                    ],
                     "name": "b"
                   }
                 ]
@@ -190,15 +154,12 @@
                 "column": 26
               }
             },
-            "range": [
-              24,
-              26
-            ],
             "body": []
           },
           "parenthesizedExpression": true
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/172/expected.json b/test/fixtures/harmony/uncategorised/172/expected.json
index 23d09d58f1..82b82246ff 100644
--- a/test/fixtures/harmony/uncategorised/172/expected.json
+++ b/test/fixtures/harmony/uncategorised/172/expected.json
@@ -12,10 +12,6 @@
       "column": 56
     }
   },
-  "range": [
-    0,
-    56
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 56
       }
     },
-    "range": [
-      0,
-      56
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 56
           }
         },
-        "range": [
-          0,
-          56
-        ],
         "expression": {
           "type": "FunctionExpression",
           "start": 1,
@@ -68,10 +56,6 @@
               "column": 55
             }
           },
-          "range": [
-            1,
-            55
-          ],
           "id": {
             "type": "Identifier",
             "start": 10,
@@ -86,10 +70,6 @@
                 "column": 11
               }
             },
-            "range": [
-              10,
-              11
-            ],
             "name": "x"
           },
           "generator": false,
@@ -109,10 +89,6 @@
                   "column": 38
                 }
               },
-              "range": [
-                12,
-                38
-              ],
               "properties": [
                 {
                   "type": "Property",
@@ -128,10 +104,6 @@
                       "column": 25
                     }
                   },
-                  "range": [
-                    14,
-                    25
-                  ],
                   "method": false,
                   "shorthand": false,
                   "computed": false,
@@ -149,10 +121,6 @@
                         "column": 15
                       }
                     },
-                    "range": [
-                      14,
-                      15
-                    ],
                     "name": "a"
                   },
                   "value": {
@@ -169,10 +137,6 @@
                         "column": 25
                       }
                     },
-                    "range": [
-                      17,
-                      25
-                    ],
                     "properties": [
                       {
                         "type": "Property",
@@ -188,10 +152,6 @@
                             "column": 20
                           }
                         },
-                        "range": [
-                          19,
-                          20
-                        ],
                         "method": false,
                         "shorthand": true,
                         "computed": false,
@@ -209,10 +169,6 @@
                               "column": 20
                             }
                           },
-                          "range": [
-                            19,
-                            20
-                          ],
                           "name": "w"
                         },
                         "kind": "init",
@@ -230,10 +186,6 @@
                               "column": 20
                             }
                           },
-                          "range": [
-                            19,
-                            20
-                          ],
                           "name": "w"
                         }
                       },
@@ -251,10 +203,6 @@
                             "column": 23
                           }
                         },
-                        "range": [
-                          22,
-                          23
-                        ],
                         "method": false,
                         "shorthand": true,
                         "computed": false,
@@ -272,10 +220,6 @@
                               "column": 23
                             }
                           },
-                          "range": [
-                            22,
-                            23
-                          ],
                           "name": "x"
                         },
                         "kind": "init",
@@ -293,10 +237,6 @@
                               "column": 23
                             }
                           },
-                          "range": [
-                            22,
-                            23
-                          ],
                           "name": "x"
                         }
                       }
@@ -318,10 +258,6 @@
                       "column": 36
                     }
                   },
-                  "range": [
-                    27,
-                    36
-                  ],
                   "method": false,
                   "shorthand": false,
                   "computed": false,
@@ -339,10 +275,6 @@
                         "column": 28
                       }
                     },
-                    "range": [
-                      27,
-                      28
-                    ],
                     "name": "b"
                   },
                   "value": {
@@ -359,10 +291,6 @@
                         "column": 36
                       }
                     },
-                    "range": [
-                      30,
-                      36
-                    ],
                     "elements": [
                       {
                         "type": "Identifier",
@@ -378,10 +306,6 @@
                             "column": 32
                           }
                         },
-                        "range": [
-                          31,
-                          32
-                        ],
                         "name": "y"
                       },
                       {
@@ -398,10 +322,6 @@
                             "column": 35
                           }
                         },
-                        "range": [
-                          34,
-                          35
-                        ],
                         "name": "z"
                       }
                     ]
@@ -424,10 +344,6 @@
                   "column": 52
                 }
               },
-              "range": [
-                40,
-                52
-              ],
               "argument": {
                 "type": "ArrayPattern",
                 "start": 43,
@@ -442,10 +358,6 @@
                     "column": 52
                   }
                 },
-                "range": [
-                  43,
-                  52
-                ],
                 "elements": [
                   {
                     "type": "Identifier",
@@ -461,10 +373,6 @@
                         "column": 45
                       }
                     },
-                    "range": [
-                      44,
-                      45
-                    ],
                     "name": "a"
                   },
                   {
@@ -481,10 +389,6 @@
                         "column": 48
                       }
                     },
-                    "range": [
-                      47,
-                      48
-                    ],
                     "name": "b"
                   },
                   {
@@ -501,10 +405,6 @@
                         "column": 51
                       }
                     },
-                    "range": [
-                      50,
-                      51
-                    ],
                     "name": "c"
                   }
                 ]
@@ -525,15 +425,12 @@
                 "column": 55
               }
             },
-            "range": [
-              53,
-              55
-            ],
             "body": []
           },
           "parenthesizedExpression": true
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/173/expected.json b/test/fixtures/harmony/uncategorised/173/expected.json
index 29394edaf8..aab765b409 100644
--- a/test/fixtures/harmony/uncategorised/173/expected.json
+++ b/test/fixtures/harmony/uncategorised/173/expected.json
@@ -12,10 +12,6 @@
       "column": 19
     }
   },
-  "range": [
-    0,
-    19
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 19
       }
     },
-    "range": [
-      0,
-      19
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 19
           }
         },
-        "range": [
-          0,
-          19
-        ],
         "expression": {
           "type": "ObjectExpression",
           "start": 1,
@@ -68,10 +56,6 @@
               "column": 18
             }
           },
-          "range": [
-            1,
-            18
-          ],
           "properties": [
             {
               "type": "Property",
@@ -87,10 +71,6 @@
                   "column": 16
                 }
               },
-              "range": [
-                3,
-                16
-              ],
               "method": true,
               "shorthand": false,
               "computed": false,
@@ -108,10 +88,6 @@
                     "column": 4
                   }
                 },
-                "range": [
-                  3,
-                  4
-                ],
                 "name": "x"
               },
               "kind": "init",
@@ -129,10 +105,6 @@
                     "column": 16
                   }
                 },
-                "range": [
-                  4,
-                  16
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -151,10 +123,6 @@
                         "column": 13
                       }
                     },
-                    "range": [
-                      5,
-                      13
-                    ],
                     "elements": [
                       {
                         "type": "Identifier",
@@ -170,10 +138,6 @@
                             "column": 8
                           }
                         },
-                        "range": [
-                          7,
-                          8
-                        ],
                         "name": "a"
                       },
                       {
@@ -190,10 +154,6 @@
                             "column": 11
                           }
                         },
-                        "range": [
-                          10,
-                          11
-                        ],
                         "name": "b"
                       }
                     ]
@@ -213,10 +173,6 @@
                       "column": 16
                     }
                   },
-                  "range": [
-                    14,
-                    16
-                  ],
                   "body": []
                 }
               }
@@ -226,5 +182,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/174/expected.json b/test/fixtures/harmony/uncategorised/174/expected.json
index e8a1a93b05..cf763cceac 100644
--- a/test/fixtures/harmony/uncategorised/174/expected.json
+++ b/test/fixtures/harmony/uncategorised/174/expected.json
@@ -12,10 +12,6 @@
       "column": 22
     }
   },
-  "range": [
-    0,
-    22
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 22
       }
     },
-    "range": [
-      0,
-      22
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 22
           }
         },
-        "range": [
-          0,
-          22
-        ],
         "expression": {
           "type": "ObjectExpression",
           "start": 1,
@@ -68,10 +56,6 @@
               "column": 21
             }
           },
-          "range": [
-            1,
-            21
-          ],
           "properties": [
             {
               "type": "Property",
@@ -87,10 +71,6 @@
                   "column": 19
                 }
               },
-              "range": [
-                3,
-                19
-              ],
               "method": true,
               "shorthand": false,
               "computed": false,
@@ -108,10 +88,6 @@
                     "column": 4
                   }
                 },
-                "range": [
-                  3,
-                  4
-                ],
                 "name": "x"
               },
               "kind": "init",
@@ -129,10 +105,6 @@
                     "column": 19
                   }
                 },
-                "range": [
-                  4,
-                  19
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -151,10 +123,6 @@
                         "column": 16
                       }
                     },
-                    "range": [
-                      5,
-                      16
-                    ],
                     "argument": {
                       "type": "ArrayPattern",
                       "start": 8,
@@ -169,10 +137,6 @@
                           "column": 16
                         }
                       },
-                      "range": [
-                        8,
-                        16
-                      ],
                       "elements": [
                         {
                           "type": "Identifier",
@@ -188,10 +152,6 @@
                               "column": 11
                             }
                           },
-                          "range": [
-                            10,
-                            11
-                          ],
                           "name": "a"
                         },
                         {
@@ -208,10 +168,6 @@
                               "column": 14
                             }
                           },
-                          "range": [
-                            13,
-                            14
-                          ],
                           "name": "b"
                         }
                       ]
@@ -232,10 +188,6 @@
                       "column": 19
                     }
                   },
-                  "range": [
-                    17,
-                    19
-                  ],
                   "body": []
                 }
               }
@@ -245,5 +197,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/175/expected.json b/test/fixtures/harmony/uncategorised/175/expected.json
index d2db03b9b8..27674eb5f7 100644
--- a/test/fixtures/harmony/uncategorised/175/expected.json
+++ b/test/fixtures/harmony/uncategorised/175/expected.json
@@ -12,10 +12,6 @@
       "column": 51
     }
   },
-  "range": [
-    0,
-    51
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 51
       }
     },
-    "range": [
-      0,
-      51
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 51
           }
         },
-        "range": [
-          0,
-          51
-        ],
         "expression": {
           "type": "ObjectExpression",
           "start": 1,
@@ -68,10 +56,6 @@
               "column": 50
             }
           },
-          "range": [
-            1,
-            50
-          ],
           "properties": [
             {
               "type": "Property",
@@ -87,10 +71,6 @@
                   "column": 48
                 }
               },
-              "range": [
-                3,
-                48
-              ],
               "method": true,
               "shorthand": false,
               "computed": false,
@@ -108,10 +88,6 @@
                     "column": 4
                   }
                 },
-                "range": [
-                  3,
-                  4
-                ],
                 "name": "x"
               },
               "kind": "init",
@@ -129,10 +105,6 @@
                     "column": 48
                   }
                 },
-                "range": [
-                  4,
-                  48
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -151,10 +123,6 @@
                         "column": 31
                       }
                     },
-                    "range": [
-                      5,
-                      31
-                    ],
                     "properties": [
                       {
                         "type": "Property",
@@ -170,10 +138,6 @@
                             "column": 18
                           }
                         },
-                        "range": [
-                          7,
-                          18
-                        ],
                         "method": false,
                         "shorthand": false,
                         "computed": false,
@@ -191,10 +155,6 @@
                               "column": 8
                             }
                           },
-                          "range": [
-                            7,
-                            8
-                          ],
                           "name": "a"
                         },
                         "value": {
@@ -211,10 +171,6 @@
                               "column": 18
                             }
                           },
-                          "range": [
-                            10,
-                            18
-                          ],
                           "properties": [
                             {
                               "type": "Property",
@@ -230,10 +186,6 @@
                                   "column": 13
                                 }
                               },
-                              "range": [
-                                12,
-                                13
-                              ],
                               "method": false,
                               "shorthand": true,
                               "computed": false,
@@ -251,10 +203,6 @@
                                     "column": 13
                                   }
                                 },
-                                "range": [
-                                  12,
-                                  13
-                                ],
                                 "name": "w"
                               },
                               "kind": "init",
@@ -272,10 +220,6 @@
                                     "column": 13
                                   }
                                 },
-                                "range": [
-                                  12,
-                                  13
-                                ],
                                 "name": "w"
                               }
                             },
@@ -293,10 +237,6 @@
                                   "column": 16
                                 }
                               },
-                              "range": [
-                                15,
-                                16
-                              ],
                               "method": false,
                               "shorthand": true,
                               "computed": false,
@@ -314,10 +254,6 @@
                                     "column": 16
                                   }
                                 },
-                                "range": [
-                                  15,
-                                  16
-                                ],
                                 "name": "x"
                               },
                               "kind": "init",
@@ -335,10 +271,6 @@
                                     "column": 16
                                   }
                                 },
-                                "range": [
-                                  15,
-                                  16
-                                ],
                                 "name": "x"
                               }
                             }
@@ -360,10 +292,6 @@
                             "column": 29
                           }
                         },
-                        "range": [
-                          20,
-                          29
-                        ],
                         "method": false,
                         "shorthand": false,
                         "computed": false,
@@ -381,10 +309,6 @@
                               "column": 21
                             }
                           },
-                          "range": [
-                            20,
-                            21
-                          ],
                           "name": "b"
                         },
                         "value": {
@@ -401,10 +325,6 @@
                               "column": 29
                             }
                           },
-                          "range": [
-                            23,
-                            29
-                          ],
                           "elements": [
                             {
                               "type": "Identifier",
@@ -420,10 +340,6 @@
                                   "column": 25
                                 }
                               },
-                              "range": [
-                                24,
-                                25
-                              ],
                               "name": "y"
                             },
                             {
@@ -440,10 +356,6 @@
                                   "column": 28
                                 }
                               },
-                              "range": [
-                                27,
-                                28
-                              ],
                               "name": "z"
                             }
                           ]
@@ -466,10 +378,6 @@
                         "column": 45
                       }
                     },
-                    "range": [
-                      33,
-                      45
-                    ],
                     "argument": {
                       "type": "ArrayPattern",
                       "start": 36,
@@ -484,10 +392,6 @@
                           "column": 45
                         }
                       },
-                      "range": [
-                        36,
-                        45
-                      ],
                       "elements": [
                         {
                           "type": "Identifier",
@@ -503,10 +407,6 @@
                               "column": 38
                             }
                           },
-                          "range": [
-                            37,
-                            38
-                          ],
                           "name": "a"
                         },
                         {
@@ -523,10 +423,6 @@
                               "column": 41
                             }
                           },
-                          "range": [
-                            40,
-                            41
-                          ],
                           "name": "b"
                         },
                         {
@@ -543,10 +439,6 @@
                               "column": 44
                             }
                           },
-                          "range": [
-                            43,
-                            44
-                          ],
                           "name": "c"
                         }
                       ]
@@ -567,10 +459,6 @@
                       "column": 48
                     }
                   },
-                  "range": [
-                    46,
-                    48
-                  ],
                   "body": []
                 }
               }
@@ -580,5 +468,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/176/expected.json b/test/fixtures/harmony/uncategorised/176/expected.json
index 8a61a6642f..00ea0f3c2a 100644
--- a/test/fixtures/harmony/uncategorised/176/expected.json
+++ b/test/fixtures/harmony/uncategorised/176/expected.json
@@ -12,10 +12,6 @@
       "column": 12
     }
   },
-  "range": [
-    0,
-    12
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 12
       }
     },
-    "range": [
-      0,
-      12
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 12
           }
         },
-        "range": [
-          0,
-          12
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            0,
-            12
-          ],
           "id": null,
           "generator": false,
           "expression": false,
@@ -90,10 +74,6 @@
                   "column": 5
                 }
               },
-              "range": [
-                1,
-                5
-              ],
               "argument": {
                 "type": "Identifier",
                 "start": 4,
@@ -108,10 +88,6 @@
                     "column": 5
                   }
                 },
-                "range": [
-                  4,
-                  5
-                ],
                 "name": "a"
               }
             }
@@ -130,14 +106,11 @@
                 "column": 12
               }
             },
-            "range": [
-              10,
-              12
-            ],
             "body": []
           }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/177/expected.json b/test/fixtures/harmony/uncategorised/177/expected.json
index 06f09cd326..4051c8ff14 100644
--- a/test/fixtures/harmony/uncategorised/177/expected.json
+++ b/test/fixtures/harmony/uncategorised/177/expected.json
@@ -12,10 +12,6 @@
       "column": 15
     }
   },
-  "range": [
-    0,
-    15
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 15
       }
     },
-    "range": [
-      0,
-      15
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 15
           }
         },
-        "range": [
-          0,
-          15
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 15
             }
           },
-          "range": [
-            0,
-            15
-          ],
           "id": null,
           "generator": false,
           "expression": false,
@@ -90,10 +74,6 @@
                   "column": 2
                 }
               },
-              "range": [
-                1,
-                2
-              ],
               "name": "a"
             },
             {
@@ -110,10 +90,6 @@
                   "column": 8
                 }
               },
-              "range": [
-                4,
-                8
-              ],
               "argument": {
                 "type": "Identifier",
                 "start": 7,
@@ -128,10 +104,6 @@
                     "column": 8
                   }
                 },
-                "range": [
-                  7,
-                  8
-                ],
                 "name": "b"
               }
             }
@@ -150,14 +122,11 @@
                 "column": 15
               }
             },
-            "range": [
-              13,
-              15
-            ],
             "body": []
           }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/178/expected.json b/test/fixtures/harmony/uncategorised/178/expected.json
index b26df64c81..806994cb9b 100644
--- a/test/fixtures/harmony/uncategorised/178/expected.json
+++ b/test/fixtures/harmony/uncategorised/178/expected.json
@@ -12,10 +12,6 @@
       "column": 13
     }
   },
-  "range": [
-    0,
-    13
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 13
       }
     },
-    "range": [
-      0,
-      13
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 13
           }
         },
-        "range": [
-          0,
-          13
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 13
             }
           },
-          "range": [
-            0,
-            13
-          ],
           "id": null,
           "generator": false,
           "expression": false,
@@ -90,10 +74,6 @@
                   "column": 6
                 }
               },
-              "range": [
-                1,
-                6
-              ],
               "properties": [
                 {
                   "type": "Property",
@@ -109,10 +89,6 @@
                       "column": 4
                     }
                   },
-                  "range": [
-                    3,
-                    4
-                  ],
                   "method": false,
                   "shorthand": true,
                   "computed": false,
@@ -130,10 +106,6 @@
                         "column": 4
                       }
                     },
-                    "range": [
-                      3,
-                      4
-                    ],
                     "name": "a"
                   },
                   "kind": "init",
@@ -151,10 +123,6 @@
                         "column": 4
                       }
                     },
-                    "range": [
-                      3,
-                      4
-                    ],
                     "name": "a"
                   }
                 }
@@ -175,14 +143,11 @@
                 "column": 13
               }
             },
-            "range": [
-              11,
-              13
-            ],
             "body": []
           }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/179/expected.json b/test/fixtures/harmony/uncategorised/179/expected.json
index c3ee26fa13..4d7597a5b0 100644
--- a/test/fixtures/harmony/uncategorised/179/expected.json
+++ b/test/fixtures/harmony/uncategorised/179/expected.json
@@ -12,10 +12,6 @@
       "column": 19
     }
   },
-  "range": [
-    0,
-    19
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 19
       }
     },
-    "range": [
-      0,
-      19
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 19
           }
         },
-        "range": [
-          0,
-          19
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 19
             }
           },
-          "range": [
-            0,
-            19
-          ],
           "id": null,
           "generator": false,
           "expression": false,
@@ -90,10 +74,6 @@
                   "column": 6
                 }
               },
-              "range": [
-                1,
-                6
-              ],
               "properties": [
                 {
                   "type": "Property",
@@ -109,10 +89,6 @@
                       "column": 4
                     }
                   },
-                  "range": [
-                    3,
-                    4
-                  ],
                   "method": false,
                   "shorthand": true,
                   "computed": false,
@@ -130,10 +106,6 @@
                         "column": 4
                       }
                     },
-                    "range": [
-                      3,
-                      4
-                    ],
                     "name": "a"
                   },
                   "kind": "init",
@@ -151,10 +123,6 @@
                         "column": 4
                       }
                     },
-                    "range": [
-                      3,
-                      4
-                    ],
                     "name": "a"
                   }
                 }
@@ -174,10 +142,6 @@
                   "column": 12
                 }
               },
-              "range": [
-                8,
-                12
-              ],
               "argument": {
                 "type": "Identifier",
                 "start": 11,
@@ -192,10 +156,6 @@
                     "column": 12
                   }
                 },
-                "range": [
-                  11,
-                  12
-                ],
                 "name": "b"
               }
             }
@@ -214,14 +174,11 @@
                 "column": 19
               }
             },
-            "range": [
-              17,
-              19
-            ],
             "body": []
           }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/18/expected.json b/test/fixtures/harmony/uncategorised/18/expected.json
index dad656897d..066751d992 100644
--- a/test/fixtures/harmony/uncategorised/18/expected.json
+++ b/test/fixtures/harmony/uncategorised/18/expected.json
@@ -12,10 +12,6 @@
       "column": 4
     }
   },
-  "range": [
-    0,
-    4
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 4
       }
     },
-    "range": [
-      0,
-      4
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 4
           }
         },
-        "range": [
-          0,
-          4
-        ],
         "expression": {
           "type": "TemplateLiteral",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 4
             }
           },
-          "range": [
-            0,
-            4
-          ],
           "expressions": [],
           "quasis": [
             {
@@ -88,10 +72,6 @@
                   "column": 3
                 }
               },
-              "range": [
-                1,
-                3
-              ],
               "value": {
                 "raw": "42",
                 "cooked": "42"
@@ -102,5 +82,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/180/expected.json b/test/fixtures/harmony/uncategorised/180/expected.json
index af35ee8e1c..56845a6f74 100644
--- a/test/fixtures/harmony/uncategorised/180/expected.json
+++ b/test/fixtures/harmony/uncategorised/180/expected.json
@@ -12,10 +12,6 @@
       "column": 17
     }
   },
-  "range": [
-    0,
-    17
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 17
       }
     },
-    "range": [
-      0,
-      17
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 17
           }
         },
-        "range": [
-          0,
-          17
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 17
             }
           },
-          "range": [
-            0,
-            17
-          ],
           "id": null,
           "generator": false,
           "expression": false,
@@ -90,10 +74,6 @@
                   "column": 10
                 }
               },
-              "range": [
-                1,
-                10
-              ],
               "argument": {
                 "type": "ArrayPattern",
                 "start": 4,
@@ -108,10 +88,6 @@
                     "column": 10
                   }
                 },
-                "range": [
-                  4,
-                  10
-                ],
                 "elements": [
                   {
                     "type": "Identifier",
@@ -127,10 +103,6 @@
                         "column": 6
                       }
                     },
-                    "range": [
-                      5,
-                      6
-                    ],
                     "name": "a"
                   },
                   {
@@ -147,10 +119,6 @@
                         "column": 9
                       }
                     },
-                    "range": [
-                      8,
-                      9
-                    ],
                     "name": "b"
                   }
                 ]
@@ -171,14 +139,11 @@
                 "column": 17
               }
             },
-            "range": [
-              15,
-              17
-            ],
             "body": []
           }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/181/expected.json b/test/fixtures/harmony/uncategorised/181/expected.json
index 76d5224485..ef57adb398 100644
--- a/test/fixtures/harmony/uncategorised/181/expected.json
+++ b/test/fixtures/harmony/uncategorised/181/expected.json
@@ -12,10 +12,6 @@
       "column": 17
     }
   },
-  "range": [
-    0,
-    17
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 17
       }
     },
-    "range": [
-      0,
-      17
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 17
           }
         },
-        "range": [
-          0,
-          17
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 17
             }
           },
-          "range": [
-            0,
-            17
-          ],
           "id": null,
           "generator": false,
           "expression": false,
@@ -90,10 +74,6 @@
                   "column": 2
                 }
               },
-              "range": [
-                1,
-                2
-              ],
               "name": "a"
             },
             {
@@ -110,10 +90,6 @@
                   "column": 10
                 }
               },
-              "range": [
-                4,
-                10
-              ],
               "argument": {
                 "type": "ArrayPattern",
                 "start": 7,
@@ -128,10 +104,6 @@
                     "column": 10
                   }
                 },
-                "range": [
-                  7,
-                  10
-                ],
                 "elements": [
                   {
                     "type": "Identifier",
@@ -147,10 +119,6 @@
                         "column": 9
                       }
                     },
-                    "range": [
-                      8,
-                      9
-                    ],
                     "name": "b"
                   }
                 ]
@@ -171,14 +139,11 @@
                 "column": 17
               }
             },
-            "range": [
-              15,
-              17
-            ],
             "body": []
           }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/182/expected.json b/test/fixtures/harmony/uncategorised/182/expected.json
index ca9ea9cae7..d18c636d50 100644
--- a/test/fixtures/harmony/uncategorised/182/expected.json
+++ b/test/fixtures/harmony/uncategorised/182/expected.json
@@ -12,10 +12,6 @@
       "column": 27
     }
   },
-  "range": [
-    0,
-    27
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 27
       }
     },
-    "range": [
-      0,
-      27
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 27
           }
         },
-        "range": [
-          0,
-          27
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 27
             }
           },
-          "range": [
-            0,
-            27
-          ],
           "id": null,
           "generator": false,
           "expression": false,
@@ -90,10 +74,6 @@
                   "column": 14
                 }
               },
-              "range": [
-                1,
-                14
-              ],
               "properties": [
                 {
                   "type": "Property",
@@ -109,10 +89,6 @@
                       "column": 12
                     }
                   },
-                  "range": [
-                    3,
-                    12
-                  ],
                   "method": false,
                   "shorthand": false,
                   "computed": false,
@@ -130,10 +106,6 @@
                         "column": 4
                       }
                     },
-                    "range": [
-                      3,
-                      4
-                    ],
                     "name": "a"
                   },
                   "value": {
@@ -150,10 +122,6 @@
                         "column": 12
                       }
                     },
-                    "range": [
-                      6,
-                      12
-                    ],
                     "elements": [
                       {
                         "type": "Identifier",
@@ -169,10 +137,6 @@
                             "column": 8
                           }
                         },
-                        "range": [
-                          7,
-                          8
-                        ],
                         "name": "a"
                       },
                       {
@@ -189,10 +153,6 @@
                             "column": 11
                           }
                         },
-                        "range": [
-                          10,
-                          11
-                        ],
                         "name": "b"
                       }
                     ]
@@ -215,10 +175,6 @@
                   "column": 20
                 }
               },
-              "range": [
-                16,
-                20
-              ],
               "argument": {
                 "type": "Identifier",
                 "start": 19,
@@ -233,10 +189,6 @@
                     "column": 20
                   }
                 },
-                "range": [
-                  19,
-                  20
-                ],
                 "name": "c"
               }
             }
@@ -255,14 +207,11 @@
                 "column": 27
               }
             },
-            "range": [
-              25,
-              27
-            ],
             "body": []
           }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/183/expected.json b/test/fixtures/harmony/uncategorised/183/expected.json
index 90a3ee7e2e..52a957065f 100644
--- a/test/fixtures/harmony/uncategorised/183/expected.json
+++ b/test/fixtures/harmony/uncategorised/183/expected.json
@@ -12,10 +12,6 @@
       "column": 33
     }
   },
-  "range": [
-    0,
-    33
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 33
       }
     },
-    "range": [
-      0,
-      33
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 33
           }
         },
-        "range": [
-          0,
-          33
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 33
             }
           },
-          "range": [
-            0,
-            33
-          ],
           "id": null,
           "generator": false,
           "expression": false,
@@ -90,10 +74,6 @@
                   "column": 12
                 }
               },
-              "range": [
-                1,
-                12
-              ],
               "properties": [
                 {
                   "type": "Property",
@@ -109,10 +89,6 @@
                       "column": 7
                     }
                   },
-                  "range": [
-                    3,
-                    7
-                  ],
                   "method": false,
                   "shorthand": false,
                   "computed": false,
@@ -130,10 +106,6 @@
                         "column": 4
                       }
                     },
-                    "range": [
-                      3,
-                      4
-                    ],
                     "name": "a"
                   },
                   "value": {
@@ -150,10 +122,6 @@
                         "column": 7
                       }
                     },
-                    "range": [
-                      6,
-                      7
-                    ],
                     "name": "b"
                   },
                   "kind": "init"
@@ -172,10 +140,6 @@
                       "column": 10
                     }
                   },
-                  "range": [
-                    9,
-                    10
-                  ],
                   "method": false,
                   "shorthand": true,
                   "computed": false,
@@ -193,10 +157,6 @@
                         "column": 10
                       }
                     },
-                    "range": [
-                      9,
-                      10
-                    ],
                     "name": "c"
                   },
                   "kind": "init",
@@ -214,10 +174,6 @@
                         "column": 10
                       }
                     },
-                    "range": [
-                      9,
-                      10
-                    ],
                     "name": "c"
                   }
                 }
@@ -237,10 +193,6 @@
                   "column": 20
                 }
               },
-              "range": [
-                14,
-                20
-              ],
               "elements": [
                 {
                   "type": "Identifier",
@@ -256,10 +208,6 @@
                       "column": 16
                     }
                   },
-                  "range": [
-                    15,
-                    16
-                  ],
                   "name": "d"
                 },
                 {
@@ -276,10 +224,6 @@
                       "column": 19
                     }
                   },
-                  "range": [
-                    18,
-                    19
-                  ],
                   "name": "e"
                 }
               ]
@@ -298,10 +242,6 @@
                   "column": 26
                 }
               },
-              "range": [
-                22,
-                26
-              ],
               "argument": {
                 "type": "Identifier",
                 "start": 25,
@@ -316,10 +256,6 @@
                     "column": 26
                   }
                 },
-                "range": [
-                  25,
-                  26
-                ],
                 "name": "f"
               }
             }
@@ -338,14 +274,11 @@
                 "column": 33
               }
             },
-            "range": [
-              31,
-              33
-            ],
             "body": []
           }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/184/expected.json b/test/fixtures/harmony/uncategorised/184/expected.json
index 198fca158e..ce8b5406ef 100644
--- a/test/fixtures/harmony/uncategorised/184/expected.json
+++ b/test/fixtures/harmony/uncategorised/184/expected.json
@@ -12,10 +12,6 @@
       "column": 10
     }
   },
-  "range": [
-    0,
-    10
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 10
       }
     },
-    "range": [
-      0,
-      10
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 10
           }
         },
-        "range": [
-          0,
-          10
-        ],
         "expression": {
           "type": "AssignmentExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 10
             }
           },
-          "range": [
-            0,
-            10
-          ],
           "operator": "=",
           "left": {
             "type": "ArrayPattern",
@@ -87,10 +71,6 @@
                 "column": 6
               }
             },
-            "range": [
-              0,
-              6
-            ],
             "elements": [
               {
                 "type": "RestElement",
@@ -106,10 +86,6 @@
                     "column": 5
                   }
                 },
-                "range": [
-                  1,
-                  5
-                ],
                 "argument": {
                   "type": "Identifier",
                   "start": 4,
@@ -124,10 +100,6 @@
                       "column": 5
                     }
                   },
-                  "range": [
-                    4,
-                    5
-                  ],
                   "name": "a"
                 }
               }
@@ -147,14 +119,11 @@
                 "column": 10
               }
             },
-            "range": [
-              9,
-              10
-            ],
             "name": "b"
           }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/185/expected.json b/test/fixtures/harmony/uncategorised/185/expected.json
index f6412fc895..7876d116e8 100644
--- a/test/fixtures/harmony/uncategorised/185/expected.json
+++ b/test/fixtures/harmony/uncategorised/185/expected.json
@@ -12,10 +12,6 @@
       "column": 13
     }
   },
-  "range": [
-    0,
-    13
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 13
       }
     },
-    "range": [
-      0,
-      13
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 13
           }
         },
-        "range": [
-          0,
-          13
-        ],
         "expression": {
           "type": "AssignmentExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 13
             }
           },
-          "range": [
-            0,
-            13
-          ],
           "operator": "=",
           "left": {
             "type": "ArrayPattern",
@@ -87,10 +71,6 @@
                 "column": 9
               }
             },
-            "range": [
-              0,
-              9
-            ],
             "elements": [
               {
                 "type": "Identifier",
@@ -106,10 +86,6 @@
                     "column": 2
                   }
                 },
-                "range": [
-                  1,
-                  2
-                ],
                 "name": "a"
               },
               {
@@ -126,10 +102,6 @@
                     "column": 8
                   }
                 },
-                "range": [
-                  4,
-                  8
-                ],
                 "argument": {
                   "type": "Identifier",
                   "start": 7,
@@ -144,10 +116,6 @@
                       "column": 8
                     }
                   },
-                  "range": [
-                    7,
-                    8
-                  ],
                   "name": "b"
                 }
               }
@@ -167,14 +135,11 @@
                 "column": 13
               }
             },
-            "range": [
-              12,
-              13
-            ],
             "name": "c"
           }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/186/expected.json b/test/fixtures/harmony/uncategorised/186/expected.json
index b36b3196f1..525404a0e1 100644
--- a/test/fixtures/harmony/uncategorised/186/expected.json
+++ b/test/fixtures/harmony/uncategorised/186/expected.json
@@ -12,10 +12,6 @@
       "column": 20
     }
   },
-  "range": [
-    0,
-    20
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 20
       }
     },
-    "range": [
-      0,
-      20
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 20
           }
         },
-        "range": [
-          0,
-          20
-        ],
         "expression": {
           "type": "AssignmentExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 20
             }
           },
-          "range": [
-            0,
-            20
-          ],
           "operator": "=",
           "left": {
             "type": "ArrayPattern",
@@ -87,10 +71,6 @@
                 "column": 16
               }
             },
-            "range": [
-              0,
-              16
-            ],
             "elements": [
               {
                 "type": "ObjectPattern",
@@ -106,10 +86,6 @@
                     "column": 9
                   }
                 },
-                "range": [
-                  1,
-                  9
-                ],
                 "properties": [
                   {
                     "type": "Property",
@@ -125,10 +101,6 @@
                         "column": 4
                       }
                     },
-                    "range": [
-                      3,
-                      4
-                    ],
                     "method": false,
                     "shorthand": true,
                     "computed": false,
@@ -146,10 +118,6 @@
                           "column": 4
                         }
                       },
-                      "range": [
-                        3,
-                        4
-                      ],
                       "name": "a"
                     },
                     "kind": "init",
@@ -167,10 +135,6 @@
                           "column": 4
                         }
                       },
-                      "range": [
-                        3,
-                        4
-                      ],
                       "name": "a"
                     }
                   },
@@ -188,10 +152,6 @@
                         "column": 7
                       }
                     },
-                    "range": [
-                      6,
-                      7
-                    ],
                     "method": false,
                     "shorthand": true,
                     "computed": false,
@@ -209,10 +169,6 @@
                           "column": 7
                         }
                       },
-                      "range": [
-                        6,
-                        7
-                      ],
                       "name": "b"
                     },
                     "kind": "init",
@@ -230,10 +186,6 @@
                           "column": 7
                         }
                       },
-                      "range": [
-                        6,
-                        7
-                      ],
                       "name": "b"
                     }
                   }
@@ -253,10 +205,6 @@
                     "column": 15
                   }
                 },
-                "range": [
-                  11,
-                  15
-                ],
                 "argument": {
                   "type": "Identifier",
                   "start": 14,
@@ -271,10 +219,6 @@
                       "column": 15
                     }
                   },
-                  "range": [
-                    14,
-                    15
-                  ],
                   "name": "c"
                 }
               }
@@ -294,14 +238,11 @@
                 "column": 20
               }
             },
-            "range": [
-              19,
-              20
-            ],
             "name": "d"
           }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/187/expected.json b/test/fixtures/harmony/uncategorised/187/expected.json
index 8c04c0580b..89c48e2bde 100644
--- a/test/fixtures/harmony/uncategorised/187/expected.json
+++ b/test/fixtures/harmony/uncategorised/187/expected.json
@@ -12,10 +12,6 @@
       "column": 18
     }
   },
-  "range": [
-    0,
-    18
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 18
       }
     },
-    "range": [
-      0,
-      18
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 18
           }
         },
-        "range": [
-          0,
-          18
-        ],
         "expression": {
           "type": "AssignmentExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 18
             }
           },
-          "range": [
-            0,
-            18
-          ],
           "operator": "=",
           "left": {
             "type": "ArrayPattern",
@@ -87,10 +71,6 @@
                 "column": 14
               }
             },
-            "range": [
-              0,
-              14
-            ],
             "elements": [
               {
                 "type": "Identifier",
@@ -106,10 +86,6 @@
                     "column": 2
                   }
                 },
-                "range": [
-                  1,
-                  2
-                ],
                 "name": "a"
               },
               {
@@ -126,10 +102,6 @@
                     "column": 13
                   }
                 },
-                "range": [
-                  4,
-                  13
-                ],
                 "argument": {
                   "type": "ArrayPattern",
                   "start": 7,
@@ -144,10 +116,6 @@
                       "column": 13
                     }
                   },
-                  "range": [
-                    7,
-                    13
-                  ],
                   "elements": [
                     {
                       "type": "Identifier",
@@ -163,10 +131,6 @@
                           "column": 9
                         }
                       },
-                      "range": [
-                        8,
-                        9
-                      ],
                       "name": "b"
                     },
                     {
@@ -183,10 +147,6 @@
                           "column": 12
                         }
                       },
-                      "range": [
-                        11,
-                        12
-                      ],
                       "name": "c"
                     }
                   ]
@@ -208,14 +168,11 @@
                 "column": 18
               }
             },
-            "range": [
-              17,
-              18
-            ],
             "name": "d"
           }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/188/expected.json b/test/fixtures/harmony/uncategorised/188/expected.json
index 7937fc363a..ae113e8e2d 100644
--- a/test/fixtures/harmony/uncategorised/188/expected.json
+++ b/test/fixtures/harmony/uncategorised/188/expected.json
@@ -12,10 +12,6 @@
       "column": 14
     }
   },
-  "range": [
-    0,
-    14
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 14
       }
     },
-    "range": [
-      0,
-      14
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 14
           }
         },
-        "range": [
-          0,
-          14
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 14
               }
             },
-            "range": [
-              4,
-              14
-            ],
             "id": {
               "type": "ArrayPattern",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 10
                 }
               },
-              "range": [
-                4,
-                10
-              ],
               "elements": [
                 {
                   "type": "RestElement",
@@ -106,10 +86,6 @@
                       "column": 9
                     }
                   },
-                  "range": [
-                    5,
-                    9
-                  ],
                   "argument": {
                     "type": "Identifier",
                     "start": 8,
@@ -124,10 +100,6 @@
                         "column": 9
                       }
                     },
-                    "range": [
-                      8,
-                      9
-                    ],
                     "name": "a"
                   }
                 }
@@ -147,10 +119,6 @@
                   "column": 14
                 }
               },
-              "range": [
-                13,
-                14
-              ],
               "name": "b"
             }
           }
@@ -158,5 +126,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/189/expected.json b/test/fixtures/harmony/uncategorised/189/expected.json
index b481e4cff1..abe4eaeff9 100644
--- a/test/fixtures/harmony/uncategorised/189/expected.json
+++ b/test/fixtures/harmony/uncategorised/189/expected.json
@@ -12,10 +12,6 @@
       "column": 17
     }
   },
-  "range": [
-    0,
-    17
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 17
       }
     },
-    "range": [
-      0,
-      17
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 17
           }
         },
-        "range": [
-          0,
-          17
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 17
               }
             },
-            "range": [
-              4,
-              17
-            ],
             "id": {
               "type": "ArrayPattern",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 13
                 }
               },
-              "range": [
-                4,
-                13
-              ],
               "elements": [
                 {
                   "type": "Identifier",
@@ -106,10 +86,6 @@
                       "column": 6
                     }
                   },
-                  "range": [
-                    5,
-                    6
-                  ],
                   "name": "a"
                 },
                 {
@@ -126,10 +102,6 @@
                       "column": 12
                     }
                   },
-                  "range": [
-                    8,
-                    12
-                  ],
                   "argument": {
                     "type": "Identifier",
                     "start": 11,
@@ -144,10 +116,6 @@
                         "column": 12
                       }
                     },
-                    "range": [
-                      11,
-                      12
-                    ],
                     "name": "b"
                   }
                 }
@@ -167,10 +135,6 @@
                   "column": 17
                 }
               },
-              "range": [
-                16,
-                17
-              ],
               "name": "c"
             }
           }
@@ -178,5 +142,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/19/expected.json b/test/fixtures/harmony/uncategorised/19/expected.json
index 14751283d1..dcf190a44c 100644
--- a/test/fixtures/harmony/uncategorised/19/expected.json
+++ b/test/fixtures/harmony/uncategorised/19/expected.json
@@ -12,10 +12,6 @@
       "column": 7
     }
   },
-  "range": [
-    0,
-    7
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 7
       }
     },
-    "range": [
-      0,
-      7
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 7
           }
         },
-        "range": [
-          0,
-          7
-        ],
         "expression": {
           "type": "TaggedTemplateExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 7
             }
           },
-          "range": [
-            0,
-            7
-          ],
           "tag": {
             "type": "Identifier",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 3
               }
             },
-            "range": [
-              0,
-              3
-            ],
             "name": "raw"
           },
           "quasi": {
@@ -106,10 +86,6 @@
                 "column": 7
               }
             },
-            "range": [
-              3,
-              7
-            ],
             "expressions": [],
             "quasis": [
               {
@@ -126,10 +102,6 @@
                     "column": 6
                   }
                 },
-                "range": [
-                  4,
-                  6
-                ],
                 "value": {
                   "raw": "42",
                   "cooked": "42"
@@ -141,5 +113,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/190/expected.json b/test/fixtures/harmony/uncategorised/190/expected.json
index 5478853cf6..bb2b744d13 100644
--- a/test/fixtures/harmony/uncategorised/190/expected.json
+++ b/test/fixtures/harmony/uncategorised/190/expected.json
@@ -12,10 +12,6 @@
       "column": 24
     }
   },
-  "range": [
-    0,
-    24
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 24
       }
     },
-    "range": [
-      0,
-      24
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 24
           }
         },
-        "range": [
-          0,
-          24
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 24
               }
             },
-            "range": [
-              4,
-              24
-            ],
             "id": {
               "type": "ArrayPattern",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 20
                 }
               },
-              "range": [
-                4,
-                20
-              ],
               "elements": [
                 {
                   "type": "ObjectPattern",
@@ -106,10 +86,6 @@
                       "column": 13
                     }
                   },
-                  "range": [
-                    5,
-                    13
-                  ],
                   "properties": [
                     {
                       "type": "Property",
@@ -125,10 +101,6 @@
                           "column": 8
                         }
                       },
-                      "range": [
-                        7,
-                        8
-                      ],
                       "method": false,
                       "shorthand": true,
                       "computed": false,
@@ -146,10 +118,6 @@
                             "column": 8
                           }
                         },
-                        "range": [
-                          7,
-                          8
-                        ],
                         "name": "a"
                       },
                       "kind": "init",
@@ -167,10 +135,6 @@
                             "column": 8
                           }
                         },
-                        "range": [
-                          7,
-                          8
-                        ],
                         "name": "a"
                       }
                     },
@@ -188,10 +152,6 @@
                           "column": 11
                         }
                       },
-                      "range": [
-                        10,
-                        11
-                      ],
                       "method": false,
                       "shorthand": true,
                       "computed": false,
@@ -209,10 +169,6 @@
                             "column": 11
                           }
                         },
-                        "range": [
-                          10,
-                          11
-                        ],
                         "name": "b"
                       },
                       "kind": "init",
@@ -230,10 +186,6 @@
                             "column": 11
                           }
                         },
-                        "range": [
-                          10,
-                          11
-                        ],
                         "name": "b"
                       }
                     }
@@ -253,10 +205,6 @@
                       "column": 19
                     }
                   },
-                  "range": [
-                    15,
-                    19
-                  ],
                   "argument": {
                     "type": "Identifier",
                     "start": 18,
@@ -271,10 +219,6 @@
                         "column": 19
                       }
                     },
-                    "range": [
-                      18,
-                      19
-                    ],
                     "name": "c"
                   }
                 }
@@ -294,10 +238,6 @@
                   "column": 24
                 }
               },
-              "range": [
-                23,
-                24
-              ],
               "name": "d"
             }
           }
@@ -305,5 +245,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/191/expected.json b/test/fixtures/harmony/uncategorised/191/expected.json
index 973cb8a87d..2b36873e36 100644
--- a/test/fixtures/harmony/uncategorised/191/expected.json
+++ b/test/fixtures/harmony/uncategorised/191/expected.json
@@ -12,10 +12,6 @@
       "column": 22
     }
   },
-  "range": [
-    0,
-    22
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 22
       }
     },
-    "range": [
-      0,
-      22
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 22
           }
         },
-        "range": [
-          0,
-          22
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 22
               }
             },
-            "range": [
-              4,
-              22
-            ],
             "id": {
               "type": "ArrayPattern",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 18
                 }
               },
-              "range": [
-                4,
-                18
-              ],
               "elements": [
                 {
                   "type": "Identifier",
@@ -106,10 +86,6 @@
                       "column": 6
                     }
                   },
-                  "range": [
-                    5,
-                    6
-                  ],
                   "name": "a"
                 },
                 {
@@ -126,10 +102,6 @@
                       "column": 17
                     }
                   },
-                  "range": [
-                    8,
-                    17
-                  ],
                   "argument": {
                     "type": "ArrayPattern",
                     "start": 11,
@@ -144,10 +116,6 @@
                         "column": 17
                       }
                     },
-                    "range": [
-                      11,
-                      17
-                    ],
                     "elements": [
                       {
                         "type": "Identifier",
@@ -163,10 +131,6 @@
                             "column": 13
                           }
                         },
-                        "range": [
-                          12,
-                          13
-                        ],
                         "name": "b"
                       },
                       {
@@ -183,10 +147,6 @@
                             "column": 16
                           }
                         },
-                        "range": [
-                          15,
-                          16
-                        ],
                         "name": "c"
                       }
                     ]
@@ -208,10 +168,6 @@
                   "column": 22
                 }
               },
-              "range": [
-                21,
-                22
-              ],
               "name": "d"
             }
           }
@@ -219,5 +175,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/192/expected.json b/test/fixtures/harmony/uncategorised/192/expected.json
index ae629b000d..0b70371d47 100644
--- a/test/fixtures/harmony/uncategorised/192/expected.json
+++ b/test/fixtures/harmony/uncategorised/192/expected.json
@@ -12,10 +12,6 @@
       "column": 10
     }
   },
-  "range": [
-    0,
-    10
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 10
       }
     },
-    "range": [
-      0,
-      10
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 10
           }
         },
-        "range": [
-          0,
-          10
-        ],
         "expression": {
           "type": "CallExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 10
             }
           },
-          "range": [
-            0,
-            10
-          ],
           "callee": {
             "type": "Identifier",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 4
               }
             },
-            "range": [
-              0,
-              4
-            ],
             "name": "func"
           },
           "arguments": [
@@ -107,10 +87,6 @@
                   "column": 9
                 }
               },
-              "range": [
-                5,
-                9
-              ],
               "argument": {
                 "type": "Identifier",
                 "start": 8,
@@ -125,10 +101,6 @@
                     "column": 9
                   }
                 },
-                "range": [
-                  8,
-                  9
-                ],
                 "name": "a"
               }
             }
@@ -136,5 +108,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/193/expected.json b/test/fixtures/harmony/uncategorised/193/expected.json
index 1a2be651a5..98f7082d88 100644
--- a/test/fixtures/harmony/uncategorised/193/expected.json
+++ b/test/fixtures/harmony/uncategorised/193/expected.json
@@ -12,10 +12,6 @@
       "column": 13
     }
   },
-  "range": [
-    0,
-    13
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 13
       }
     },
-    "range": [
-      0,
-      13
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 13
           }
         },
-        "range": [
-          0,
-          13
-        ],
         "expression": {
           "type": "CallExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 13
             }
           },
-          "range": [
-            0,
-            13
-          ],
           "callee": {
             "type": "Identifier",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 4
               }
             },
-            "range": [
-              0,
-              4
-            ],
             "name": "func"
           },
           "arguments": [
@@ -107,10 +87,6 @@
                   "column": 6
                 }
               },
-              "range": [
-                5,
-                6
-              ],
               "name": "a"
             },
             {
@@ -127,10 +103,6 @@
                   "column": 12
                 }
               },
-              "range": [
-                8,
-                12
-              ],
               "argument": {
                 "type": "Identifier",
                 "start": 11,
@@ -145,10 +117,6 @@
                     "column": 12
                   }
                 },
-                "range": [
-                  11,
-                  12
-                ],
                 "name": "b"
               }
             }
@@ -156,5 +124,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/194/expected.json b/test/fixtures/harmony/uncategorised/194/expected.json
index 4bac7112e5..8c0a47724f 100644
--- a/test/fixtures/harmony/uncategorised/194/expected.json
+++ b/test/fixtures/harmony/uncategorised/194/expected.json
@@ -12,10 +12,6 @@
       "column": 13
     }
   },
-  "range": [
-    0,
-    13
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 13
       }
     },
-    "range": [
-      0,
-      13
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 13
           }
         },
-        "range": [
-          0,
-          13
-        ],
         "expression": {
           "type": "CallExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 13
             }
           },
-          "range": [
-            0,
-            13
-          ],
           "callee": {
             "type": "Identifier",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 4
               }
             },
-            "range": [
-              0,
-              4
-            ],
             "name": "func"
           },
           "arguments": [
@@ -107,10 +87,6 @@
                   "column": 9
                 }
               },
-              "range": [
-                5,
-                9
-              ],
               "argument": {
                 "type": "Identifier",
                 "start": 8,
@@ -125,10 +101,6 @@
                     "column": 9
                   }
                 },
-                "range": [
-                  8,
-                  9
-                ],
                 "name": "a"
               }
             },
@@ -146,15 +118,12 @@
                   "column": 12
                 }
               },
-              "range": [
-                11,
-                12
-              ],
               "name": "b"
             }
           ]
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/2/expected.json b/test/fixtures/harmony/uncategorised/2/expected.json
index c93c7d0cdf..fd4079e13c 100644
--- a/test/fixtures/harmony/uncategorised/2/expected.json
+++ b/test/fixtures/harmony/uncategorised/2/expected.json
@@ -12,10 +12,6 @@
       "column": 27
     }
   },
-  "range": [
-    0,
-    27
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 27
       }
     },
-    "range": [
-      0,
-      27
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 27
           }
         },
-        "range": [
-          0,
-          27
-        ],
         "expression": {
           "type": "Literal",
           "start": 0,
@@ -68,15 +56,12 @@
               "column": 27
             }
           },
-          "range": [
-            0,
-            27
-          ],
           "value": "𠮷野家",
           "rawValue": "𠮷野家",
           "raw": "\"\\u{20BB7}\\u{91CE}\\u{5BB6}\""
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/20/expected.json b/test/fixtures/harmony/uncategorised/20/expected.json
index 761c93054b..245e390fe6 100644
--- a/test/fixtures/harmony/uncategorised/20/expected.json
+++ b/test/fixtures/harmony/uncategorised/20/expected.json
@@ -12,10 +12,6 @@
       "column": 18
     }
   },
-  "range": [
-    0,
-    18
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 18
       }
     },
-    "range": [
-      0,
-      18
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 18
           }
         },
-        "range": [
-          0,
-          18
-        ],
         "expression": {
           "type": "TaggedTemplateExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 18
             }
           },
-          "range": [
-            0,
-            18
-          ],
           "tag": {
             "type": "Identifier",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 3
               }
             },
-            "range": [
-              0,
-              3
-            ],
             "name": "raw"
           },
           "quasi": {
@@ -106,10 +86,6 @@
                 "column": 18
               }
             },
-            "range": [
-              3,
-              18
-            ],
             "expressions": [
               {
                 "type": "Identifier",
@@ -125,10 +101,6 @@
                     "column": 16
                   }
                 },
-                "range": [
-                  12,
-                  16
-                ],
                 "name": "name"
               }
             ],
@@ -147,10 +119,6 @@
                     "column": 10
                   }
                 },
-                "range": [
-                  4,
-                  10
-                ],
                 "value": {
                   "raw": "hello ",
                   "cooked": "hello "
@@ -171,10 +139,6 @@
                     "column": 17
                   }
                 },
-                "range": [
-                  17,
-                  17
-                ],
                 "value": {
                   "raw": "",
                   "cooked": ""
@@ -186,5 +150,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/21/expected.json b/test/fixtures/harmony/uncategorised/21/expected.json
index 795e77823e..6f192feca1 100644
--- a/test/fixtures/harmony/uncategorised/21/expected.json
+++ b/test/fixtures/harmony/uncategorised/21/expected.json
@@ -12,10 +12,6 @@
       "column": 3
     }
   },
-  "range": [
-    0,
-    3
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 3
       }
     },
-    "range": [
-      0,
-      3
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 3
           }
         },
-        "range": [
-          0,
-          3
-        ],
         "expression": {
           "type": "TemplateLiteral",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 3
             }
           },
-          "range": [
-            0,
-            3
-          ],
           "expressions": [],
           "quasis": [
             {
@@ -88,10 +72,6 @@
                   "column": 2
                 }
               },
-              "range": [
-                1,
-                2
-              ],
               "value": {
                 "raw": "$",
                 "cooked": "$"
@@ -102,5 +82,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/22/expected.json b/test/fixtures/harmony/uncategorised/22/expected.json
index d50dc192c8..a0a63138db 100644
--- a/test/fixtures/harmony/uncategorised/22/expected.json
+++ b/test/fixtures/harmony/uncategorised/22/expected.json
@@ -12,10 +12,6 @@
       "column": 1
     }
   },
-  "range": [
-    0,
-    18
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 1
       }
     },
-    "range": [
-      0,
-      18
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 1
           }
         },
-        "range": [
-          0,
-          18
-        ],
         "expression": {
           "type": "TemplateLiteral",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 1
             }
           },
-          "range": [
-            0,
-            18
-          ],
           "expressions": [],
           "quasis": [
             {
@@ -88,10 +72,6 @@
                   "column": 0
                 }
               },
-              "range": [
-                1,
-                17
-              ],
               "value": {
                 "raw": "\\n\\r\\b\\v\\t\\f\\\n\\\n",
                 "cooked": "\n\r\b\u000b\t\f"
@@ -102,5 +82,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/23/expected.json b/test/fixtures/harmony/uncategorised/23/expected.json
index 6e822df913..f02b70e9aa 100644
--- a/test/fixtures/harmony/uncategorised/23/expected.json
+++ b/test/fixtures/harmony/uncategorised/23/expected.json
@@ -12,10 +12,6 @@
       "column": 1
     }
   },
-  "range": [
-    0,
-    5
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 1
       }
     },
-    "range": [
-      0,
-      5
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 1
           }
         },
-        "range": [
-          0,
-          5
-        ],
         "expression": {
           "type": "TemplateLiteral",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 1
             }
           },
-          "range": [
-            0,
-            5
-          ],
           "expressions": [],
           "quasis": [
             {
@@ -88,10 +72,6 @@
                   "column": 0
                 }
               },
-              "range": [
-                1,
-                4
-              ],
               "value": {
                 "raw": "\n\n\n",
                 "cooked": "\n\n\n"
@@ -102,5 +82,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/24/expected.json b/test/fixtures/harmony/uncategorised/24/expected.json
index 0c4c807da5..fb84640ac8 100644
--- a/test/fixtures/harmony/uncategorised/24/expected.json
+++ b/test/fixtures/harmony/uncategorised/24/expected.json
@@ -12,10 +12,6 @@
       "column": 26
     }
   },
-  "range": [
-    0,
-    26
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 26
       }
     },
-    "range": [
-      0,
-      26
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 26
           }
         },
-        "range": [
-          0,
-          26
-        ],
         "expression": {
           "type": "TemplateLiteral",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 26
             }
           },
-          "range": [
-            0,
-            26
-          ],
           "expressions": [],
           "quasis": [
             {
@@ -88,10 +72,6 @@
                   "column": 25
                 }
               },
-              "range": [
-                1,
-                25
-              ],
               "value": {
                 "raw": "\\u{000042}\\u0042\\x42u0\\A",
                 "cooked": "BBBu0A"
@@ -102,5 +82,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/25/expected.json b/test/fixtures/harmony/uncategorised/25/expected.json
index fbbe390fbc..483c9211ab 100644
--- a/test/fixtures/harmony/uncategorised/25/expected.json
+++ b/test/fixtures/harmony/uncategorised/25/expected.json
@@ -12,10 +12,6 @@
       "column": 11
     }
   },
-  "range": [
-    0,
-    11
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 11
       }
     },
-    "range": [
-      0,
-      11
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 11
           }
         },
-        "range": [
-          0,
-          11
-        ],
         "expression": {
           "type": "NewExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 11
             }
           },
-          "range": [
-            0,
-            11
-          ],
           "callee": {
             "type": "TaggedTemplateExpression",
             "start": 4,
@@ -86,10 +70,6 @@
                 "column": 11
               }
             },
-            "range": [
-              4,
-              11
-            ],
             "tag": {
               "type": "Identifier",
               "start": 4,
@@ -104,10 +84,6 @@
                   "column": 7
                 }
               },
-              "range": [
-                4,
-                7
-              ],
               "name": "raw"
             },
             "quasi": {
@@ -124,10 +100,6 @@
                   "column": 11
                 }
               },
-              "range": [
-                7,
-                11
-              ],
               "expressions": [],
               "quasis": [
                 {
@@ -144,10 +116,6 @@
                       "column": 10
                     }
                   },
-                  "range": [
-                    8,
-                    10
-                  ],
                   "value": {
                     "raw": "42",
                     "cooked": "42"
@@ -161,5 +129,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/256/expected.json b/test/fixtures/harmony/uncategorised/256/expected.json
index 3b6d436cd0..836f9f66a5 100644
--- a/test/fixtures/harmony/uncategorised/256/expected.json
+++ b/test/fixtures/harmony/uncategorised/256/expected.json
@@ -12,10 +12,6 @@
       "column": 9
     }
   },
-  "range": [
-    0,
-    9
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 9
       }
     },
-    "range": [
-      0,
-      9
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 9
           }
         },
-        "range": [
-          0,
-          9
-        ],
         "expression": {
           "type": "BinaryExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 9
             }
           },
-          "range": [
-            0,
-            9
-          ],
           "left": {
             "type": "Identifier",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 5
               }
             },
-            "range": [
-              0,
-              5
-            ],
             "name": "yield"
           },
           "operator": "*",
@@ -107,10 +87,6 @@
                 "column": 9
               }
             },
-            "range": [
-              7,
-              9
-            ],
             "value": 10,
             "rawValue": 10,
             "raw": "10"
@@ -118,5 +94,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/257/expected.json b/test/fixtures/harmony/uncategorised/257/expected.json
index c9ec8d2bbb..4c98e444eb 100644
--- a/test/fixtures/harmony/uncategorised/257/expected.json
+++ b/test/fixtures/harmony/uncategorised/257/expected.json
@@ -12,10 +12,6 @@
       "column": 14
     }
   },
-  "range": [
-    0,
-    14
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 14
       }
     },
-    "range": [
-      0,
-      14
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 14
           }
         },
-        "range": [
-          0,
-          14
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 14
             }
           },
-          "range": [
-            0,
-            14
-          ],
           "id": null,
           "generator": false,
           "expression": true,
@@ -90,10 +74,6 @@
                   "column": 1
                 }
               },
-              "range": [
-                0,
-                1
-              ],
               "name": "e"
             }
           ],
@@ -111,10 +91,6 @@
                 "column": 14
               }
             },
-            "range": [
-              5,
-              14
-            ],
             "left": {
               "type": "Identifier",
               "start": 5,
@@ -129,10 +105,6 @@
                   "column": 10
                 }
               },
-              "range": [
-                5,
-                10
-              ],
               "name": "yield"
             },
             "operator": "*",
@@ -150,10 +122,6 @@
                   "column": 14
                 }
               },
-              "range": [
-                12,
-                14
-              ],
               "value": 10,
               "rawValue": 10,
               "raw": "10"
@@ -162,5 +130,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/259/expected.json b/test/fixtures/harmony/uncategorised/259/expected.json
index cab055cecf..0a6392a4fb 100644
--- a/test/fixtures/harmony/uncategorised/259/expected.json
+++ b/test/fixtures/harmony/uncategorised/259/expected.json
@@ -12,10 +12,6 @@
       "column": 27
     }
   },
-  "range": [
-    0,
-    27
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 27
       }
     },
-    "range": [
-      0,
-      27
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 27
           }
         },
-        "range": [
-          0,
-          27
-        ],
         "expression": {
           "type": "FunctionExpression",
           "start": 1,
@@ -68,10 +56,6 @@
               "column": 26
             }
           },
-          "range": [
-            1,
-            26
-          ],
           "id": null,
           "generator": false,
           "expression": false,
@@ -90,10 +74,6 @@
                 "column": 26
               }
             },
-            "range": [
-              13,
-              26
-            ],
             "body": [
               {
                 "type": "ExpressionStatement",
@@ -109,10 +89,6 @@
                     "column": 24
                   }
                 },
-                "range": [
-                  15,
-                  24
-                ],
                 "expression": {
                   "type": "BinaryExpression",
                   "start": 15,
@@ -127,10 +103,6 @@
                       "column": 24
                     }
                   },
-                  "range": [
-                    15,
-                    24
-                  ],
                   "left": {
                     "type": "Identifier",
                     "start": 15,
@@ -145,10 +117,6 @@
                         "column": 20
                       }
                     },
-                    "range": [
-                      15,
-                      20
-                    ],
                     "name": "yield"
                   },
                   "operator": "*",
@@ -166,10 +134,6 @@
                         "column": 24
                       }
                     },
-                    "range": [
-                      22,
-                      24
-                    ],
                     "value": 10,
                     "rawValue": 10,
                     "raw": "10"
@@ -182,5 +146,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/27/expected.json b/test/fixtures/harmony/uncategorised/27/expected.json
index 03d7e8df2e..e66752bc00 100644
--- a/test/fixtures/harmony/uncategorised/27/expected.json
+++ b/test/fixtures/harmony/uncategorised/27/expected.json
@@ -12,10 +12,6 @@
       "column": 47
     }
   },
-  "range": [
-    0,
-    47
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 47
       }
     },
-    "range": [
-      0,
-      47
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 47
           }
         },
-        "range": [
-          0,
-          47
-        ],
         "discriminant": {
           "type": "Identifier",
           "start": 8,
@@ -68,10 +56,6 @@
               "column": 14
             }
           },
-          "range": [
-            8,
-            14
-          ],
           "name": "answer"
         },
         "cases": [
@@ -89,10 +73,6 @@
                 "column": 45
               }
             },
-            "range": [
-              18,
-              45
-            ],
             "consequent": [
               {
                 "type": "VariableDeclaration",
@@ -108,10 +88,6 @@
                     "column": 38
                   }
                 },
-                "range": [
-                  27,
-                  38
-                ],
                 "declarations": [
                   {
                     "type": "VariableDeclarator",
@@ -127,10 +103,6 @@
                         "column": 37
                       }
                     },
-                    "range": [
-                      31,
-                      37
-                    ],
                     "id": {
                       "type": "Identifier",
                       "start": 31,
@@ -145,10 +117,6 @@
                           "column": 32
                         }
                       },
-                      "range": [
-                        31,
-                        32
-                      ],
                       "name": "t"
                     },
                     "init": {
@@ -165,10 +133,6 @@
                           "column": 37
                         }
                       },
-                      "range": [
-                        35,
-                        37
-                      ],
                       "value": 42,
                       "rawValue": 42,
                       "raw": "42"
@@ -191,10 +155,6 @@
                     "column": 45
                   }
                 },
-                "range": [
-                  39,
-                  45
-                ],
                 "label": null
               }
             ],
@@ -212,10 +172,6 @@
                   "column": 25
                 }
               },
-              "range": [
-                23,
-                25
-              ],
               "value": 42,
               "rawValue": 42,
               "raw": "42"
@@ -224,5 +180,6 @@
         ]
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/28/expected.json b/test/fixtures/harmony/uncategorised/28/expected.json
index d01d114f6f..e05229464f 100644
--- a/test/fixtures/harmony/uncategorised/28/expected.json
+++ b/test/fixtures/harmony/uncategorised/28/expected.json
@@ -12,10 +12,6 @@
       "column": 12
     }
   },
-  "range": [
-    0,
-    12
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 12
       }
     },
-    "range": [
-      0,
-      12
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 12
           }
         },
-        "range": [
-          0,
-          12
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            0,
-            12
-          ],
           "id": null,
           "generator": false,
           "expression": true,
@@ -90,10 +74,6 @@
                 "column": 12
               }
             },
-            "range": [
-              6,
-              12
-            ],
             "value": "test",
             "rawValue": "test",
             "raw": "\"test\""
@@ -101,5 +81,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/29/expected.json b/test/fixtures/harmony/uncategorised/29/expected.json
index 2c466f20a7..59c25b25cd 100644
--- a/test/fixtures/harmony/uncategorised/29/expected.json
+++ b/test/fixtures/harmony/uncategorised/29/expected.json
@@ -12,10 +12,6 @@
       "column": 11
     }
   },
-  "range": [
-    0,
-    11
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 11
       }
     },
-    "range": [
-      0,
-      11
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 11
           }
         },
-        "range": [
-          0,
-          11
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 11
             }
           },
-          "range": [
-            0,
-            11
-          ],
           "id": null,
           "generator": false,
           "expression": true,
@@ -90,10 +74,6 @@
                   "column": 1
                 }
               },
-              "range": [
-                0,
-                1
-              ],
               "name": "e"
             }
           ],
@@ -111,10 +91,6 @@
                 "column": 11
               }
             },
-            "range": [
-              5,
-              11
-            ],
             "value": "test",
             "rawValue": "test",
             "raw": "\"test\""
@@ -122,5 +98,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/292/expected.json b/test/fixtures/harmony/uncategorised/292/expected.json
index 6f2037ac63..c53f6a5581 100644
--- a/test/fixtures/harmony/uncategorised/292/expected.json
+++ b/test/fixtures/harmony/uncategorised/292/expected.json
@@ -12,10 +12,6 @@
       "column": 12
     }
   },
-  "range": [
-    0,
-    12
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 12
       }
     },
-    "range": [
-      0,
-      12
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 12
           }
         },
-        "range": [
-          0,
-          12
-        ],
         "expression": {
           "type": "AssignmentExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            0,
-            12
-          ],
           "operator": "=",
           "left": {
             "type": "ArrayPattern",
@@ -87,10 +71,6 @@
                 "column": 8
               }
             },
-            "range": [
-              0,
-              8
-            ],
             "elements": [
               {
                 "type": "RestElement",
@@ -106,10 +86,6 @@
                     "column": 5
                   }
                 },
-                "range": [
-                  1,
-                  5
-                ],
                 "argument": {
                   "type": "Identifier",
                   "start": 4,
@@ -124,10 +100,6 @@
                       "column": 5
                     }
                   },
-                  "range": [
-                    4,
-                    5
-                  ],
                   "name": "a"
                 }
               }
@@ -147,14 +119,11 @@
                 "column": 12
               }
             },
-            "range": [
-              11,
-              12
-            ],
             "name": "b"
           }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/3/expected.json b/test/fixtures/harmony/uncategorised/3/expected.json
index a8ea5f8efd..f5ca6c6f39 100644
--- a/test/fixtures/harmony/uncategorised/3/expected.json
+++ b/test/fixtures/harmony/uncategorised/3/expected.json
@@ -12,10 +12,6 @@
       "column": 2
     }
   },
-  "range": [
-    0,
-    2
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 2
       }
     },
-    "range": [
-      0,
-      2
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 2
           }
         },
-        "range": [
-          0,
-          2
-        ],
         "expression": {
           "type": "Literal",
           "start": 0,
@@ -68,15 +56,12 @@
               "column": 2
             }
           },
-          "range": [
-            0,
-            2
-          ],
           "value": 0,
           "rawValue": 0,
           "raw": "00"
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/30/expected.json b/test/fixtures/harmony/uncategorised/30/expected.json
index dd01678586..b0d9fc44f3 100644
--- a/test/fixtures/harmony/uncategorised/30/expected.json
+++ b/test/fixtures/harmony/uncategorised/30/expected.json
@@ -12,10 +12,6 @@
       "column": 13
     }
   },
-  "range": [
-    0,
-    13
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 13
       }
     },
-    "range": [
-      0,
-      13
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 13
           }
         },
-        "range": [
-          0,
-          13
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 13
             }
           },
-          "range": [
-            0,
-            13
-          ],
           "id": null,
           "generator": false,
           "expression": true,
@@ -90,10 +74,6 @@
                   "column": 2
                 }
               },
-              "range": [
-                1,
-                2
-              ],
               "name": "e"
             }
           ],
@@ -111,10 +91,6 @@
                 "column": 13
               }
             },
-            "range": [
-              7,
-              13
-            ],
             "value": "test",
             "rawValue": "test",
             "raw": "\"test\""
@@ -122,5 +98,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/304/expected.json b/test/fixtures/harmony/uncategorised/304/expected.json
index 834d1c2f58..455984bf89 100644
--- a/test/fixtures/harmony/uncategorised/304/expected.json
+++ b/test/fixtures/harmony/uncategorised/304/expected.json
@@ -12,10 +12,6 @@
       "column": 45
     }
   },
-  "range": [
-    0,
-    45
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 45
       }
     },
-    "range": [
-      0,
-      45
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 45
           }
         },
-        "range": [
-          0,
-          45
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 45
               }
             },
-            "range": [
-              4,
-              45
-            ],
             "id": {
               "type": "ObjectPattern",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 39
                 }
               },
-              "range": [
-                4,
-                39
-              ],
               "properties": [
                 {
                   "type": "Property",
@@ -106,10 +86,6 @@
                       "column": 38
                     }
                   },
-                  "range": [
-                    5,
-                    38
-                  ],
                   "method": false,
                   "shorthand": false,
                   "computed": false,
@@ -127,10 +103,6 @@
                         "column": 13
                       }
                     },
-                    "range": [
-                      5,
-                      13
-                    ],
                     "name": "propName"
                   },
                   "value": {
@@ -147,10 +119,6 @@
                         "column": 38
                       }
                     },
-                    "range": [
-                      15,
-                      38
-                    ],
                     "operator": "=",
                     "left": {
                       "type": "Identifier",
@@ -166,10 +134,6 @@
                           "column": 23
                         }
                       },
-                      "range": [
-                        15,
-                        23
-                      ],
                       "name": "localVar"
                     },
                     "right": {
@@ -186,10 +150,6 @@
                           "column": 38
                         }
                       },
-                      "range": [
-                        26,
-                        38
-                      ],
                       "name": "defaultValue"
                     }
                   },
@@ -211,10 +171,6 @@
                   "column": 45
                 }
               },
-              "range": [
-                42,
-                45
-              ],
               "name": "obj"
             }
           }
@@ -222,5 +178,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/305/expected.json b/test/fixtures/harmony/uncategorised/305/expected.json
index d6d4d7a725..d0caf950d9 100644
--- a/test/fixtures/harmony/uncategorised/305/expected.json
+++ b/test/fixtures/harmony/uncategorised/305/expected.json
@@ -12,10 +12,6 @@
       "column": 35
     }
   },
-  "range": [
-    0,
-    35
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 35
       }
     },
-    "range": [
-      0,
-      35
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 35
           }
         },
-        "range": [
-          0,
-          35
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 35
               }
             },
-            "range": [
-              4,
-              35
-            ],
             "id": {
               "type": "ObjectPattern",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 29
                 }
               },
-              "range": [
-                4,
-                29
-              ],
               "properties": [
                 {
                   "type": "Property",
@@ -106,10 +86,6 @@
                       "column": 28
                     }
                   },
-                  "range": [
-                    5,
-                    28
-                  ],
                   "method": false,
                   "shorthand": true,
                   "computed": false,
@@ -127,10 +103,6 @@
                         "column": 13
                       }
                     },
-                    "range": [
-                      5,
-                      13
-                    ],
                     "name": "propName"
                   },
                   "kind": "init",
@@ -148,10 +120,6 @@
                         "column": 28
                       }
                     },
-                    "range": [
-                      5,
-                      28
-                    ],
                     "operator": "=",
                     "left": {
                       "type": "Identifier",
@@ -167,10 +135,6 @@
                           "column": 13
                         }
                       },
-                      "range": [
-                        5,
-                        13
-                      ],
                       "name": "propName"
                     },
                     "right": {
@@ -187,10 +151,6 @@
                           "column": 28
                         }
                       },
-                      "range": [
-                        16,
-                        28
-                      ],
                       "name": "defaultValue"
                     }
                   }
@@ -211,10 +171,6 @@
                   "column": 35
                 }
               },
-              "range": [
-                32,
-                35
-              ],
               "name": "obj"
             }
           }
@@ -222,5 +178,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/306/expected.json b/test/fixtures/harmony/uncategorised/306/expected.json
index 2d8b534196..bfa5d16bc1 100644
--- a/test/fixtures/harmony/uncategorised/306/expected.json
+++ b/test/fixtures/harmony/uncategorised/306/expected.json
@@ -12,10 +12,6 @@
       "column": 35
     }
   },
-  "range": [
-    0,
-    35
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 35
       }
     },
-    "range": [
-      0,
-      35
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 35
           }
         },
-        "range": [
-          0,
-          35
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 35
               }
             },
-            "range": [
-              4,
-              35
-            ],
             "id": {
               "type": "ArrayPattern",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 29
                 }
               },
-              "range": [
-                4,
-                29
-              ],
               "elements": [
                 {
                   "type": "AssignmentPattern",
@@ -106,10 +86,6 @@
                       "column": 28
                     }
                   },
-                  "range": [
-                    5,
-                    28
-                  ],
                   "operator": "=",
                   "left": {
                     "type": "Identifier",
@@ -125,10 +101,6 @@
                         "column": 13
                       }
                     },
-                    "range": [
-                      5,
-                      13
-                    ],
                     "name": "localVar"
                   },
                   "right": {
@@ -145,10 +117,6 @@
                         "column": 28
                       }
                     },
-                    "range": [
-                      16,
-                      28
-                    ],
                     "name": "defaultValue"
                   }
                 }
@@ -168,10 +136,6 @@
                   "column": 35
                 }
               },
-              "range": [
-                32,
-                35
-              ],
               "name": "obj"
             }
           }
@@ -179,5 +143,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/307/expected.json b/test/fixtures/harmony/uncategorised/307/expected.json
index ced7a5674c..6dbf417ffe 100644
--- a/test/fixtures/harmony/uncategorised/307/expected.json
+++ b/test/fixtures/harmony/uncategorised/307/expected.json
@@ -12,10 +12,6 @@
       "column": 15
     }
   },
-  "range": [
-    0,
-    15
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 15
       }
     },
-    "range": [
-      0,
-      15
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 15
           }
         },
-        "range": [
-          0,
-          15
-        ],
         "expression": {
           "type": "AssignmentExpression",
           "start": 1,
@@ -68,10 +56,6 @@
               "column": 14
             }
           },
-          "range": [
-            1,
-            14
-          ],
           "operator": "=",
           "left": {
             "type": "ObjectPattern",
@@ -87,10 +71,6 @@
                 "column": 8
               }
             },
-            "range": [
-              1,
-              8
-            ],
             "properties": [
               {
                 "type": "Property",
@@ -106,10 +86,6 @@
                     "column": 7
                   }
                 },
-                "range": [
-                  2,
-                  7
-                ],
                 "method": false,
                 "shorthand": true,
                 "computed": false,
@@ -127,10 +103,6 @@
                       "column": 3
                     }
                   },
-                  "range": [
-                    2,
-                    3
-                  ],
                   "name": "x"
                 },
                 "kind": "init",
@@ -148,10 +120,6 @@
                       "column": 7
                     }
                   },
-                  "range": [
-                    2,
-                    7
-                  ],
                   "operator": "=",
                   "left": {
                     "type": "Identifier",
@@ -167,10 +135,6 @@
                         "column": 3
                       }
                     },
-                    "range": [
-                      2,
-                      3
-                    ],
                     "name": "x"
                   },
                   "right": {
@@ -187,10 +151,6 @@
                         "column": 7
                       }
                     },
-                    "range": [
-                      6,
-                      7
-                    ],
                     "value": 0,
                     "rawValue": 0,
                     "raw": "0"
@@ -213,15 +173,12 @@
                 "column": 14
               }
             },
-            "range": [
-              11,
-              14
-            ],
             "name": "obj"
           },
           "parenthesizedExpression": true
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/308/expected.json b/test/fixtures/harmony/uncategorised/308/expected.json
index ac1531ffe4..394ef8f378 100644
--- a/test/fixtures/harmony/uncategorised/308/expected.json
+++ b/test/fixtures/harmony/uncategorised/308/expected.json
@@ -12,10 +12,6 @@
       "column": 14
     }
   },
-  "range": [
-    0,
-    14
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 14
       }
     },
-    "range": [
-      0,
-      14
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 14
           }
         },
-        "range": [
-          0,
-          14
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 14
             }
           },
-          "range": [
-            0,
-            14
-          ],
           "id": null,
           "generator": false,
           "expression": true,
@@ -90,10 +74,6 @@
                   "column": 8
                 }
               },
-              "range": [
-                1,
-                8
-              ],
               "properties": [
                 {
                   "type": "Property",
@@ -109,10 +89,6 @@
                       "column": 7
                     }
                   },
-                  "range": [
-                    2,
-                    7
-                  ],
                   "method": false,
                   "shorthand": true,
                   "computed": false,
@@ -130,10 +106,6 @@
                         "column": 3
                       }
                     },
-                    "range": [
-                      2,
-                      3
-                    ],
                     "name": "x"
                   },
                   "kind": "init",
@@ -151,10 +123,6 @@
                         "column": 7
                       }
                     },
-                    "range": [
-                      2,
-                      7
-                    ],
                     "operator": "=",
                     "left": {
                       "type": "Identifier",
@@ -170,10 +138,6 @@
                           "column": 3
                         }
                       },
-                      "range": [
-                        2,
-                        3
-                      ],
                       "name": "x"
                     },
                     "right": {
@@ -190,10 +154,6 @@
                           "column": 7
                         }
                       },
-                      "range": [
-                        6,
-                        7
-                      ],
                       "value": 0,
                       "rawValue": 0,
                       "raw": "0"
@@ -217,14 +177,11 @@
                 "column": 14
               }
             },
-            "range": [
-              13,
-              14
-            ],
             "name": "x"
           }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/309/expected.json b/test/fixtures/harmony/uncategorised/309/expected.json
index 33b016eb1c..c9fa8ee649 100644
--- a/test/fixtures/harmony/uncategorised/309/expected.json
+++ b/test/fixtures/harmony/uncategorised/309/expected.json
@@ -12,10 +12,6 @@
       "column": 23
     }
   },
-  "range": [
-    0,
-    23
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 23
       }
     },
-    "range": [
-      0,
-      23
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 23
           }
         },
-        "range": [
-          0,
-          23
-        ],
         "expression": {
           "type": "AssignmentExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 23
             }
           },
-          "range": [
-            0,
-            23
-          ],
           "operator": "=",
           "left": {
             "type": "ArrayPattern",
@@ -87,10 +71,6 @@
                 "column": 17
               }
             },
-            "range": [
-              0,
-              17
-            ],
             "elements": [
               {
                 "type": "Identifier",
@@ -106,10 +86,6 @@
                     "column": 2
                   }
                 },
-                "range": [
-                  1,
-                  2
-                ],
                 "name": "a"
               },
               {
@@ -126,10 +102,6 @@
                     "column": 16
                   }
                 },
-                "range": [
-                  4,
-                  16
-                ],
                 "properties": [
                   {
                     "type": "Property",
@@ -145,10 +117,6 @@
                         "column": 15
                       }
                     },
-                    "range": [
-                      5,
-                      15
-                    ],
                     "method": false,
                     "shorthand": false,
                     "computed": false,
@@ -166,10 +134,6 @@
                           "column": 6
                         }
                       },
-                      "range": [
-                        5,
-                        6
-                      ],
                       "name": "b"
                     },
                     "value": {
@@ -186,10 +150,6 @@
                           "column": 15
                         }
                       },
-                      "range": [
-                        8,
-                        15
-                      ],
                       "properties": [
                         {
                           "type": "Property",
@@ -205,10 +165,6 @@
                               "column": 14
                             }
                           },
-                          "range": [
-                            9,
-                            14
-                          ],
                           "method": false,
                           "shorthand": true,
                           "computed": false,
@@ -226,10 +182,6 @@
                                 "column": 10
                               }
                             },
-                            "range": [
-                              9,
-                              10
-                            ],
                             "name": "c"
                           },
                           "kind": "init",
@@ -247,10 +199,6 @@
                                 "column": 14
                               }
                             },
-                            "range": [
-                              9,
-                              14
-                            ],
                             "operator": "=",
                             "left": {
                               "type": "Identifier",
@@ -266,10 +214,6 @@
                                   "column": 10
                                 }
                               },
-                              "range": [
-                                9,
-                                10
-                              ],
                               "name": "c"
                             },
                             "right": {
@@ -286,10 +230,6 @@
                                   "column": 14
                                 }
                               },
-                              "range": [
-                                13,
-                                14
-                              ],
                               "value": 1,
                               "rawValue": 1,
                               "raw": "1"
@@ -318,14 +258,11 @@
                 "column": 23
               }
             },
-            "range": [
-              20,
-              23
-            ],
             "name": "arr"
           }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/31/expected.json b/test/fixtures/harmony/uncategorised/31/expected.json
index 386dd08a65..b53fa03e5e 100644
--- a/test/fixtures/harmony/uncategorised/31/expected.json
+++ b/test/fixtures/harmony/uncategorised/31/expected.json
@@ -12,10 +12,6 @@
       "column": 16
     }
   },
-  "range": [
-    0,
-    16
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 16
       }
     },
-    "range": [
-      0,
-      16
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 16
           }
         },
-        "range": [
-          0,
-          16
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 16
             }
           },
-          "range": [
-            0,
-            16
-          ],
           "id": null,
           "generator": false,
           "expression": true,
@@ -90,10 +74,6 @@
                   "column": 2
                 }
               },
-              "range": [
-                1,
-                2
-              ],
               "name": "a"
             },
             {
@@ -110,10 +90,6 @@
                   "column": 5
                 }
               },
-              "range": [
-                4,
-                5
-              ],
               "name": "b"
             }
           ],
@@ -131,10 +107,6 @@
                 "column": 16
               }
             },
-            "range": [
-              10,
-              16
-            ],
             "value": "test",
             "rawValue": "test",
             "raw": "\"test\""
@@ -142,5 +114,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/310/expected.json b/test/fixtures/harmony/uncategorised/310/expected.json
index 96a1f507cb..a334d92bdf 100644
--- a/test/fixtures/harmony/uncategorised/310/expected.json
+++ b/test/fixtures/harmony/uncategorised/310/expected.json
@@ -12,10 +12,6 @@
       "column": 21
     }
   },
-  "range": [
-    0,
-    21
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 21
       }
     },
-    "range": [
-      0,
-      21
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 21
           }
         },
-        "range": [
-          0,
-          21
-        ],
         "left": {
           "type": "ObjectPattern",
           "start": 5,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            5,
-            12
-          ],
           "properties": [
             {
               "type": "Property",
@@ -87,10 +71,6 @@
                   "column": 11
                 }
               },
-              "range": [
-                6,
-                11
-              ],
               "method": false,
               "shorthand": true,
               "computed": false,
@@ -108,10 +88,6 @@
                     "column": 7
                   }
                 },
-                "range": [
-                  6,
-                  7
-                ],
                 "name": "x"
               },
               "kind": "init",
@@ -129,10 +105,6 @@
                     "column": 11
                   }
                 },
-                "range": [
-                  6,
-                  11
-                ],
                 "operator": "=",
                 "left": {
                   "type": "Identifier",
@@ -148,10 +120,6 @@
                       "column": 7
                     }
                   },
-                  "range": [
-                    6,
-                    7
-                  ],
                   "name": "x"
                 },
                 "right": {
@@ -168,10 +136,6 @@
                       "column": 11
                     }
                   },
-                  "range": [
-                    10,
-                    11
-                  ],
                   "value": 0,
                   "rawValue": 0,
                   "raw": "0"
@@ -194,10 +158,6 @@
               "column": 19
             }
           },
-          "range": [
-            16,
-            19
-          ],
           "name": "arr"
         },
         "body": {
@@ -213,13 +173,10 @@
               "line": 1,
               "column": 21
             }
-          },
-          "range": [
-            20,
-            21
-          ]
+          }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/313/expected.json b/test/fixtures/harmony/uncategorised/313/expected.json
index 5b49b6092c..d56fc1ce39 100644
--- a/test/fixtures/harmony/uncategorised/313/expected.json
+++ b/test/fixtures/harmony/uncategorised/313/expected.json
@@ -12,10 +12,6 @@
       "column": 27
     }
   },
-  "range": [
-    0,
-    27
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 27
       }
     },
-    "range": [
-      0,
-      27
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 27
           }
         },
-        "range": [
-          0,
-          27
-        ],
         "block": {
           "type": "BlockStatement",
           "start": 4,
@@ -68,10 +56,6 @@
               "column": 6
             }
           },
-          "range": [
-            4,
-            6
-          ],
           "body": []
         },
         "handler": {
@@ -88,10 +72,6 @@
               "column": 27
             }
           },
-          "range": [
-            7,
-            27
-          ],
           "param": {
             "type": "ObjectPattern",
             "start": 14,
@@ -106,10 +86,6 @@
                 "column": 23
               }
             },
-            "range": [
-              14,
-              23
-            ],
             "properties": [
               {
                 "type": "Property",
@@ -125,10 +101,6 @@
                     "column": 22
                   }
                 },
-                "range": [
-                  15,
-                  22
-                ],
                 "method": false,
                 "shorthand": true,
                 "computed": false,
@@ -146,10 +118,6 @@
                       "column": 22
                     }
                   },
-                  "range": [
-                    15,
-                    22
-                  ],
                   "name": "message"
                 },
                 "kind": "init",
@@ -167,10 +135,6 @@
                       "column": 22
                     }
                   },
-                  "range": [
-                    15,
-                    22
-                  ],
                   "name": "message"
                 }
               }
@@ -190,10 +154,6 @@
                 "column": 27
               }
             },
-            "range": [
-              25,
-              27
-            ],
             "body": []
           }
         },
@@ -201,5 +161,6 @@
         "finalizer": null
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/314/expected.json b/test/fixtures/harmony/uncategorised/314/expected.json
index a39dd5d729..251b838ffe 100644
--- a/test/fixtures/harmony/uncategorised/314/expected.json
+++ b/test/fixtures/harmony/uncategorised/314/expected.json
@@ -12,10 +12,6 @@
       "column": 23
     }
   },
-  "range": [
-    0,
-    23
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 23
       }
     },
-    "range": [
-      0,
-      23
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 23
           }
         },
-        "range": [
-          0,
-          23
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 7
             }
           },
-          "range": [
-            6,
-            7
-          ],
           "name": "A"
         },
         "superClass": null,
@@ -89,10 +73,6 @@
               "column": 23
             }
           },
-          "range": [
-            8,
-            23
-          ],
           "body": [
             {
               "type": "MethodDefinition",
@@ -108,10 +88,6 @@
                   "column": 21
                 }
               },
-              "range": [
-                10,
-                21
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -127,10 +103,6 @@
                     "column": 16
                   }
                 },
-                "range": [
-                  10,
-                  16
-                ],
                 "name": "static"
               },
               "static": false,
@@ -149,10 +121,6 @@
                     "column": 21
                   }
                 },
-                "range": [
-                  16,
-                  21
-                ],
                 "id": null,
                 "generator": false,
                 "expression": false,
@@ -171,10 +139,6 @@
                       "column": 21
                     }
                   },
-                  "range": [
-                    19,
-                    21
-                  ],
                   "body": []
                 }
               }
@@ -183,5 +147,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/315/expected.json b/test/fixtures/harmony/uncategorised/315/expected.json
index 25ed64855e..a379342239 100644
--- a/test/fixtures/harmony/uncategorised/315/expected.json
+++ b/test/fixtures/harmony/uncategorised/315/expected.json
@@ -12,10 +12,6 @@
       "column": 33
     }
   },
-  "range": [
-    0,
-    33
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 33
       }
     },
-    "range": [
-      0,
-      33
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 33
           }
         },
-        "range": [
-          0,
-          33
-        ],
         "left": {
           "type": "VariableDeclaration",
           "start": 5,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            5,
-            12
-          ],
           "declarations": [
             {
               "type": "VariableDeclarator",
@@ -87,10 +71,6 @@
                   "column": 12
                 }
               },
-              "range": [
-                11,
-                12
-              ],
               "id": {
                 "type": "Identifier",
                 "start": 11,
@@ -105,10 +85,6 @@
                     "column": 12
                   }
                 },
-                "range": [
-                  11,
-                  12
-                ],
                 "name": "x"
               },
               "init": null
@@ -130,10 +106,6 @@
               "column": 20
             }
           },
-          "range": [
-            16,
-            20
-          ],
           "name": "list"
         },
         "body": {
@@ -150,10 +122,6 @@
               "column": 33
             }
           },
-          "range": [
-            22,
-            33
-          ],
           "expression": {
             "type": "CallExpression",
             "start": 22,
@@ -168,10 +136,6 @@
                 "column": 32
               }
             },
-            "range": [
-              22,
-              32
-            ],
             "callee": {
               "type": "Identifier",
               "start": 22,
@@ -186,10 +150,6 @@
                   "column": 29
                 }
               },
-              "range": [
-                22,
-                29
-              ],
               "name": "process"
             },
             "arguments": [
@@ -207,10 +167,6 @@
                     "column": 31
                   }
                 },
-                "range": [
-                  30,
-                  31
-                ],
                 "name": "x"
               }
             ]
@@ -218,5 +174,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/316/expected.json b/test/fixtures/harmony/uncategorised/316/expected.json
index 9ca89fd09d..d0a93d30d0 100644
--- a/test/fixtures/harmony/uncategorised/316/expected.json
+++ b/test/fixtures/harmony/uncategorised/316/expected.json
@@ -12,10 +12,6 @@
       "column": 24
     }
   },
-  "range": [
-    0,
-    24
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 24
       }
     },
-    "range": [
-      0,
-      24
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 24
           }
         },
-        "range": [
-          0,
-          24
-        ],
         "id": {
           "type": "Identifier",
           "start": 6,
@@ -68,10 +56,6 @@
               "column": 7
             }
           },
-          "range": [
-            6,
-            7
-          ],
           "name": "A"
         },
         "superClass": null,
@@ -89,10 +73,6 @@
               "column": 24
             }
           },
-          "range": [
-            8,
-            24
-          ],
           "body": [
             {
               "type": "MethodDefinition",
@@ -108,10 +88,6 @@
                   "column": 22
                 }
               },
-              "range": [
-                10,
-                22
-              ],
               "computed": false,
               "key": {
                 "type": "Identifier",
@@ -127,10 +103,6 @@
                     "column": 17
                   }
                 },
-                "range": [
-                  11,
-                  17
-                ],
                 "name": "static"
               },
               "static": false,
@@ -149,10 +121,6 @@
                     "column": 22
                   }
                 },
-                "range": [
-                  17,
-                  22
-                ],
                 "id": null,
                 "generator": true,
                 "expression": false,
@@ -171,10 +139,6 @@
                       "column": 22
                     }
                   },
-                  "range": [
-                    20,
-                    22
-                  ],
                   "body": []
                 }
               }
@@ -183,5 +147,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/32/expected.json b/test/fixtures/harmony/uncategorised/32/expected.json
index 5adb93ac71..5f23cad1a9 100644
--- a/test/fixtures/harmony/uncategorised/32/expected.json
+++ b/test/fixtures/harmony/uncategorised/32/expected.json
@@ -12,10 +12,6 @@
       "column": 12
     }
   },
-  "range": [
-    0,
-    12
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 12
       }
     },
-    "range": [
-      0,
-      12
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 12
           }
         },
-        "range": [
-          0,
-          12
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            0,
-            12
-          ],
           "id": null,
           "generator": false,
           "expression": false,
@@ -90,10 +74,6 @@
                   "column": 1
                 }
               },
-              "range": [
-                0,
-                1
-              ],
               "name": "e"
             }
           ],
@@ -111,10 +91,6 @@
                 "column": 12
               }
             },
-            "range": [
-              5,
-              12
-            ],
             "body": [
               {
                 "type": "ExpressionStatement",
@@ -130,10 +106,6 @@
                     "column": 10
                   }
                 },
-                "range": [
-                  7,
-                  10
-                ],
                 "expression": {
                   "type": "Literal",
                   "start": 7,
@@ -148,10 +120,6 @@
                       "column": 9
                     }
                   },
-                  "range": [
-                    7,
-                    9
-                  ],
                   "value": 42,
                   "rawValue": 42,
                   "raw": "42"
@@ -162,5 +130,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/33/expected.json b/test/fixtures/harmony/uncategorised/33/expected.json
index 0328455d8a..73ca4f7fdb 100644
--- a/test/fixtures/harmony/uncategorised/33/expected.json
+++ b/test/fixtures/harmony/uncategorised/33/expected.json
@@ -12,10 +12,6 @@
       "column": 23
     }
   },
-  "range": [
-    0,
-    23
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 23
       }
     },
-    "range": [
-      0,
-      23
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 23
           }
         },
-        "range": [
-          0,
-          23
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 23
             }
           },
-          "range": [
-            0,
-            23
-          ],
           "id": null,
           "generator": false,
           "expression": true,
@@ -90,10 +74,6 @@
                   "column": 1
                 }
               },
-              "range": [
-                0,
-                1
-              ],
               "name": "e"
             }
           ],
@@ -111,10 +91,6 @@
                 "column": 22
               }
             },
-            "range": [
-              6,
-              22
-            ],
             "properties": [
               {
                 "type": "Property",
@@ -130,10 +106,6 @@
                     "column": 20
                   }
                 },
-                "range": [
-                  8,
-                  20
-                ],
                 "method": false,
                 "shorthand": false,
                 "computed": false,
@@ -151,10 +123,6 @@
                       "column": 16
                     }
                   },
-                  "range": [
-                    8,
-                    16
-                  ],
                   "name": "property"
                 },
                 "value": {
@@ -171,10 +139,6 @@
                       "column": 20
                     }
                   },
-                  "range": [
-                    18,
-                    20
-                  ],
                   "value": 42,
                   "rawValue": 42,
                   "raw": "42"
@@ -187,5 +151,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/34/expected.json b/test/fixtures/harmony/uncategorised/34/expected.json
index 8212b67274..959082456b 100644
--- a/test/fixtures/harmony/uncategorised/34/expected.json
+++ b/test/fixtures/harmony/uncategorised/34/expected.json
@@ -12,10 +12,6 @@
       "column": 18
     }
   },
-  "range": [
-    0,
-    18
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 18
       }
     },
-    "range": [
-      0,
-      18
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 18
           }
         },
-        "range": [
-          0,
-          18
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 18
             }
           },
-          "range": [
-            0,
-            18
-          ],
           "id": null,
           "generator": false,
           "expression": false,
@@ -90,10 +74,6 @@
                   "column": 1
                 }
               },
-              "range": [
-                0,
-                1
-              ],
               "name": "e"
             }
           ],
@@ -111,10 +91,6 @@
                 "column": 18
               }
             },
-            "range": [
-              5,
-              18
-            ],
             "body": [
               {
                 "type": "LabeledStatement",
@@ -130,10 +106,6 @@
                     "column": 16
                   }
                 },
-                "range": [
-                  7,
-                  16
-                ],
                 "body": {
                   "type": "ExpressionStatement",
                   "start": 14,
@@ -148,10 +120,6 @@
                       "column": 16
                     }
                   },
-                  "range": [
-                    14,
-                    16
-                  ],
                   "expression": {
                     "type": "Literal",
                     "start": 14,
@@ -166,10 +134,6 @@
                         "column": 16
                       }
                     },
-                    "range": [
-                      14,
-                      16
-                    ],
                     "value": 42,
                     "rawValue": 42,
                     "raw": "42"
@@ -189,10 +153,6 @@
                       "column": 12
                     }
                   },
-                  "range": [
-                    7,
-                    12
-                  ],
                   "name": "label"
                 }
               }
@@ -201,5 +161,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/35/expected.json b/test/fixtures/harmony/uncategorised/35/expected.json
index 89a7d0e35b..484d42d231 100644
--- a/test/fixtures/harmony/uncategorised/35/expected.json
+++ b/test/fixtures/harmony/uncategorised/35/expected.json
@@ -12,10 +12,6 @@
       "column": 17
     }
   },
-  "range": [
-    0,
-    17
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 17
       }
     },
-    "range": [
-      0,
-      17
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 17
           }
         },
-        "range": [
-          0,
-          17
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 17
             }
           },
-          "range": [
-            0,
-            17
-          ],
           "id": null,
           "generator": false,
           "expression": false,
@@ -90,10 +74,6 @@
                   "column": 2
                 }
               },
-              "range": [
-                1,
-                2
-              ],
               "name": "a"
             },
             {
@@ -110,10 +90,6 @@
                   "column": 5
                 }
               },
-              "range": [
-                4,
-                5
-              ],
               "name": "b"
             }
           ],
@@ -131,10 +107,6 @@
                 "column": 17
               }
             },
-            "range": [
-              10,
-              17
-            ],
             "body": [
               {
                 "type": "ExpressionStatement",
@@ -150,10 +122,6 @@
                     "column": 15
                   }
                 },
-                "range": [
-                  12,
-                  15
-                ],
                 "expression": {
                   "type": "Literal",
                   "start": 12,
@@ -168,10 +136,6 @@
                       "column": 14
                     }
                   },
-                  "range": [
-                    12,
-                    14
-                  ],
                   "value": 42,
                   "rawValue": 42,
                   "raw": "42"
@@ -182,5 +146,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/36/expected.json b/test/fixtures/harmony/uncategorised/36/expected.json
index 599ed961c7..bde5188bf8 100644
--- a/test/fixtures/harmony/uncategorised/36/expected.json
+++ b/test/fixtures/harmony/uncategorised/36/expected.json
@@ -12,10 +12,6 @@
       "column": 16
     }
   },
-  "range": [
-    0,
-    16
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 16
       }
     },
-    "range": [
-      0,
-      16
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 16
           }
         },
-        "range": [
-          0,
-          16
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 16
             }
           },
-          "range": [
-            0,
-            16
-          ],
           "id": null,
           "generator": false,
           "expression": true,
@@ -90,10 +74,6 @@
                   "column": 9
                 }
               },
-              "range": [
-                1,
-                9
-              ],
               "elements": [
                 {
                   "type": "Identifier",
@@ -109,10 +89,6 @@
                       "column": 3
                     }
                   },
-                  "range": [
-                    2,
-                    3
-                  ],
                   "name": "a"
                 },
                 null,
@@ -130,10 +106,6 @@
                       "column": 8
                     }
                   },
-                  "range": [
-                    7,
-                    8
-                  ],
                   "name": "b"
                 }
               ]
@@ -153,10 +125,6 @@
                 "column": 16
               }
             },
-            "range": [
-              14,
-              16
-            ],
             "value": 42,
             "rawValue": 42,
             "raw": "42"
@@ -164,5 +132,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/39/expected.json b/test/fixtures/harmony/uncategorised/39/expected.json
index 9d2a367cb8..ad9e441cca 100644
--- a/test/fixtures/harmony/uncategorised/39/expected.json
+++ b/test/fixtures/harmony/uncategorised/39/expected.json
@@ -12,10 +12,6 @@
       "column": 14
     }
   },
-  "range": [
-    0,
-    14
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 14
       }
     },
-    "range": [
-      0,
-      14
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 14
           }
         },
-        "range": [
-          0,
-          14
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 14
             }
           },
-          "range": [
-            0,
-            14
-          ],
           "id": null,
           "generator": false,
           "expression": true,
@@ -90,10 +74,6 @@
                   "column": 4
                 }
               },
-              "range": [
-                1,
-                4
-              ],
               "left": {
                 "type": "Identifier",
                 "start": 1,
@@ -108,10 +88,6 @@
                     "column": 2
                   }
                 },
-                "range": [
-                  1,
-                  2
-                ],
                 "name": "x"
               },
               "right": {
@@ -128,10 +104,6 @@
                     "column": 4
                   }
                 },
-                "range": [
-                  3,
-                  4
-                ],
                 "value": 1,
                 "rawValue": 1,
                 "raw": "1"
@@ -152,10 +124,6 @@
                 "column": 14
               }
             },
-            "range": [
-              9,
-              14
-            ],
             "left": {
               "type": "Identifier",
               "start": 9,
@@ -170,10 +138,6 @@
                   "column": 10
                 }
               },
-              "range": [
-                9,
-                10
-              ],
               "name": "x"
             },
             "operator": "*",
@@ -191,15 +155,12 @@
                   "column": 14
                 }
               },
-              "range": [
-                13,
-                14
-              ],
               "name": "x"
             }
           }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/4/expected.json b/test/fixtures/harmony/uncategorised/4/expected.json
index 22db8e34ca..6288501cd1 100644
--- a/test/fixtures/harmony/uncategorised/4/expected.json
+++ b/test/fixtures/harmony/uncategorised/4/expected.json
@@ -12,10 +12,6 @@
       "column": 3
     }
   },
-  "range": [
-    0,
-    3
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 3
       }
     },
-    "range": [
-      0,
-      3
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 3
           }
         },
-        "range": [
-          0,
-          3
-        ],
         "expression": {
           "type": "Literal",
           "start": 0,
@@ -68,15 +56,12 @@
               "column": 3
             }
           },
-          "range": [
-            0,
-            3
-          ],
           "value": 0,
           "rawValue": 0,
           "raw": "0o0"
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/40/expected.json b/test/fixtures/harmony/uncategorised/40/expected.json
index 757caf1bd2..61c99a2fcc 100644
--- a/test/fixtures/harmony/uncategorised/40/expected.json
+++ b/test/fixtures/harmony/uncategorised/40/expected.json
@@ -12,10 +12,6 @@
       "column": 10
     }
   },
-  "range": [
-    0,
-    10
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 10
       }
     },
-    "range": [
-      0,
-      10
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 10
           }
         },
-        "range": [
-          0,
-          10
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 10
             }
           },
-          "range": [
-            0,
-            10
-          ],
           "id": null,
           "generator": false,
           "expression": true,
@@ -90,10 +74,6 @@
                   "column": 4
                 }
               },
-              "range": [
-                0,
-                4
-              ],
               "name": "eval"
             }
           ],
@@ -111,10 +91,6 @@
                 "column": 10
               }
             },
-            "range": [
-              8,
-              10
-            ],
             "value": 42,
             "rawValue": 42,
             "raw": "42"
@@ -122,5 +98,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/41/expected.json b/test/fixtures/harmony/uncategorised/41/expected.json
index 5468a6f073..94171780d3 100644
--- a/test/fixtures/harmony/uncategorised/41/expected.json
+++ b/test/fixtures/harmony/uncategorised/41/expected.json
@@ -12,10 +12,6 @@
       "column": 15
     }
   },
-  "range": [
-    0,
-    15
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 15
       }
     },
-    "range": [
-      0,
-      15
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 15
           }
         },
-        "range": [
-          0,
-          15
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 15
             }
           },
-          "range": [
-            0,
-            15
-          ],
           "id": null,
           "generator": false,
           "expression": true,
@@ -90,10 +74,6 @@
                   "column": 9
                 }
               },
-              "range": [
-                0,
-                9
-              ],
               "name": "arguments"
             }
           ],
@@ -111,10 +91,6 @@
                 "column": 15
               }
             },
-            "range": [
-              13,
-              15
-            ],
             "value": 42,
             "rawValue": 42,
             "raw": "42"
@@ -122,5 +98,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/42/expected.json b/test/fixtures/harmony/uncategorised/42/expected.json
index 09097ef77a..657dea1e69 100644
--- a/test/fixtures/harmony/uncategorised/42/expected.json
+++ b/test/fixtures/harmony/uncategorised/42/expected.json
@@ -12,10 +12,6 @@
       "column": 9
     }
   },
-  "range": [
-    0,
-    9
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 9
       }
     },
-    "range": [
-      0,
-      9
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 9
           }
         },
-        "range": [
-          0,
-          9
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 9
             }
           },
-          "range": [
-            0,
-            9
-          ],
           "id": null,
           "generator": false,
           "expression": true,
@@ -90,10 +74,6 @@
                   "column": 2
                 }
               },
-              "range": [
-                1,
-                2
-              ],
               "name": "a"
             }
           ],
@@ -111,10 +91,6 @@
                 "column": 9
               }
             },
-            "range": [
-              7,
-              9
-            ],
             "value": 0,
             "rawValue": 0,
             "raw": "00"
@@ -122,5 +98,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/43/expected.json b/test/fixtures/harmony/uncategorised/43/expected.json
index 9dbb616f35..a7af5109dd 100644
--- a/test/fixtures/harmony/uncategorised/43/expected.json
+++ b/test/fixtures/harmony/uncategorised/43/expected.json
@@ -12,10 +12,6 @@
       "column": 15
     }
   },
-  "range": [
-    0,
-    15
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 15
       }
     },
-    "range": [
-      0,
-      15
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 15
           }
         },
-        "range": [
-          0,
-          15
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 15
             }
           },
-          "range": [
-            0,
-            15
-          ],
           "id": null,
           "generator": false,
           "expression": true,
@@ -90,10 +74,6 @@
                   "column": 5
                 }
               },
-              "range": [
-                1,
-                5
-              ],
               "name": "eval"
             },
             {
@@ -110,10 +90,6 @@
                   "column": 8
                 }
               },
-              "range": [
-                7,
-                8
-              ],
               "name": "a"
             }
           ],
@@ -131,10 +107,6 @@
                 "column": 15
               }
             },
-            "range": [
-              13,
-              15
-            ],
             "value": 42,
             "rawValue": 42,
             "raw": "42"
@@ -142,5 +114,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/44/expected.json b/test/fixtures/harmony/uncategorised/44/expected.json
index 4613207cfb..f887ecd168 100644
--- a/test/fixtures/harmony/uncategorised/44/expected.json
+++ b/test/fixtures/harmony/uncategorised/44/expected.json
@@ -12,10 +12,6 @@
       "column": 17
     }
   },
-  "range": [
-    0,
-    17
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 17
       }
     },
-    "range": [
-      0,
-      17
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 17
           }
         },
-        "range": [
-          0,
-          17
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 17
             }
           },
-          "range": [
-            0,
-            17
-          ],
           "id": null,
           "generator": false,
           "expression": true,
@@ -90,10 +74,6 @@
                   "column": 10
                 }
               },
-              "range": [
-                1,
-                10
-              ],
               "left": {
                 "type": "Identifier",
                 "start": 1,
@@ -108,10 +88,6 @@
                     "column": 5
                   }
                 },
-                "range": [
-                  1,
-                  5
-                ],
                 "name": "eval"
               },
               "right": {
@@ -128,10 +104,6 @@
                     "column": 10
                   }
                 },
-                "range": [
-                  8,
-                  10
-                ],
                 "value": 10,
                 "rawValue": 10,
                 "raw": "10"
@@ -152,10 +124,6 @@
                 "column": 17
               }
             },
-            "range": [
-              15,
-              17
-            ],
             "value": 42,
             "rawValue": 42,
             "raw": "42"
@@ -163,5 +131,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/45/expected.json b/test/fixtures/harmony/uncategorised/45/expected.json
index 157ef8d24e..f45d522944 100644
--- a/test/fixtures/harmony/uncategorised/45/expected.json
+++ b/test/fixtures/harmony/uncategorised/45/expected.json
@@ -12,10 +12,6 @@
       "column": 20
     }
   },
-  "range": [
-    0,
-    20
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 20
       }
     },
-    "range": [
-      0,
-      20
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 20
           }
         },
-        "range": [
-          0,
-          20
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 20
             }
           },
-          "range": [
-            0,
-            20
-          ],
           "id": null,
           "generator": false,
           "expression": true,
@@ -90,10 +74,6 @@
                   "column": 5
                 }
               },
-              "range": [
-                1,
-                5
-              ],
               "name": "eval"
             },
             {
@@ -110,10 +90,6 @@
                   "column": 13
                 }
               },
-              "range": [
-                7,
-                13
-              ],
               "left": {
                 "type": "Identifier",
                 "start": 7,
@@ -128,10 +104,6 @@
                     "column": 8
                   }
                 },
-                "range": [
-                  7,
-                  8
-                ],
                 "name": "a"
               },
               "right": {
@@ -148,10 +120,6 @@
                     "column": 13
                   }
                 },
-                "range": [
-                  11,
-                  13
-                ],
                 "value": 10,
                 "rawValue": 10,
                 "raw": "10"
@@ -172,10 +140,6 @@
                 "column": 20
               }
             },
-            "range": [
-              18,
-              20
-            ],
             "value": 42,
             "rawValue": 42,
             "raw": "42"
@@ -183,5 +147,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/46/expected.json b/test/fixtures/harmony/uncategorised/46/expected.json
index 2132cabecb..b5b31e4fa6 100644
--- a/test/fixtures/harmony/uncategorised/46/expected.json
+++ b/test/fixtures/harmony/uncategorised/46/expected.json
@@ -12,10 +12,6 @@
       "column": 8
     }
   },
-  "range": [
-    0,
-    8
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 8
       }
     },
-    "range": [
-      0,
-      8
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 8
           }
         },
-        "range": [
-          0,
-          8
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 1,
@@ -68,10 +56,6 @@
               "column": 7
             }
           },
-          "range": [
-            1,
-            7
-          ],
           "id": null,
           "generator": false,
           "expression": true,
@@ -90,10 +74,6 @@
                   "column": 2
                 }
               },
-              "range": [
-                1,
-                2
-              ],
               "name": "x"
             }
           ],
@@ -111,15 +91,12 @@
                 "column": 7
               }
             },
-            "range": [
-              6,
-              7
-            ],
             "name": "x"
           },
           "parenthesizedExpression": true
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/47/expected.json b/test/fixtures/harmony/uncategorised/47/expected.json
index c28d578118..3b77c8e476 100644
--- a/test/fixtures/harmony/uncategorised/47/expected.json
+++ b/test/fixtures/harmony/uncategorised/47/expected.json
@@ -12,10 +12,6 @@
       "column": 12
     }
   },
-  "range": [
-    0,
-    12
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 12
       }
     },
-    "range": [
-      0,
-      12
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 12
           }
         },
-        "range": [
-          0,
-          12
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            0,
-            12
-          ],
           "id": null,
           "generator": false,
           "expression": true,
@@ -90,10 +74,6 @@
                   "column": 1
                 }
               },
-              "range": [
-                0,
-                1
-              ],
               "name": "x"
             }
           ],
@@ -111,10 +91,6 @@
                 "column": 12
               }
             },
-            "range": [
-              5,
-              12
-            ],
             "id": null,
             "generator": false,
             "expression": true,
@@ -133,10 +109,6 @@
                     "column": 6
                   }
                 },
-                "range": [
-                  5,
-                  6
-                ],
                 "name": "y"
               }
             ],
@@ -154,10 +126,6 @@
                   "column": 12
                 }
               },
-              "range": [
-                10,
-                12
-              ],
               "value": 42,
               "rawValue": 42,
               "raw": "42"
@@ -166,5 +134,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/48/expected.json b/test/fixtures/harmony/uncategorised/48/expected.json
index b96afb7017..463aa60586 100644
--- a/test/fixtures/harmony/uncategorised/48/expected.json
+++ b/test/fixtures/harmony/uncategorised/48/expected.json
@@ -12,10 +12,6 @@
       "column": 28
     }
   },
-  "range": [
-    0,
-    28
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 28
       }
     },
-    "range": [
-      0,
-      28
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 28
           }
         },
-        "range": [
-          0,
-          28
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 28
             }
           },
-          "range": [
-            0,
-            28
-          ],
           "id": null,
           "generator": false,
           "expression": true,
@@ -90,10 +74,6 @@
                   "column": 2
                 }
               },
-              "range": [
-                1,
-                2
-              ],
               "name": "x"
             }
           ],
@@ -111,10 +91,6 @@
                 "column": 27
               }
             },
-            "range": [
-              8,
-              27
-            ],
             "id": null,
             "generator": false,
             "expression": true,
@@ -133,10 +109,6 @@
                     "column": 10
                   }
                 },
-                "range": [
-                  9,
-                  10
-                ],
                 "name": "y"
               },
               {
@@ -153,10 +125,6 @@
                     "column": 13
                   }
                 },
-                "range": [
-                  12,
-                  13
-                ],
                 "name": "z"
               }
             ],
@@ -174,10 +142,6 @@
                   "column": 26
                 }
               },
-              "range": [
-                19,
-                26
-              ],
               "expressions": [
                 {
                   "type": "Identifier",
@@ -193,10 +157,6 @@
                       "column": 20
                     }
                   },
-                  "range": [
-                    19,
-                    20
-                  ],
                   "name": "x"
                 },
                 {
@@ -213,10 +173,6 @@
                       "column": 23
                     }
                   },
-                  "range": [
-                    22,
-                    23
-                  ],
                   "name": "y"
                 },
                 {
@@ -233,10 +189,6 @@
                       "column": 26
                     }
                   },
-                  "range": [
-                    25,
-                    26
-                  ],
                   "name": "z"
                 }
               ],
@@ -247,5 +199,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/49/expected.json b/test/fixtures/harmony/uncategorised/49/expected.json
index ffb8436670..5722472386 100644
--- a/test/fixtures/harmony/uncategorised/49/expected.json
+++ b/test/fixtures/harmony/uncategorised/49/expected.json
@@ -12,10 +12,6 @@
       "column": 13
     }
   },
-  "range": [
-    0,
-    13
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 13
       }
     },
-    "range": [
-      0,
-      13
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 13
           }
         },
-        "range": [
-          0,
-          13
-        ],
         "expression": {
           "type": "CallExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 13
             }
           },
-          "range": [
-            0,
-            13
-          ],
           "callee": {
             "type": "Identifier",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 3
               }
             },
-            "range": [
-              0,
-              3
-            ],
             "name": "foo"
           },
           "arguments": [
@@ -107,10 +87,6 @@
                   "column": 12
                 }
               },
-              "range": [
-                4,
-                12
-              ],
               "id": null,
               "generator": false,
               "expression": false,
@@ -129,10 +105,6 @@
                     "column": 12
                   }
                 },
-                "range": [
-                  10,
-                  12
-                ],
                 "body": []
               }
             }
@@ -140,5 +112,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/5/expected.json b/test/fixtures/harmony/uncategorised/5/expected.json
index e0ef51a1d1..e213587beb 100644
--- a/test/fixtures/harmony/uncategorised/5/expected.json
+++ b/test/fixtures/harmony/uncategorised/5/expected.json
@@ -12,10 +12,6 @@
       "column": 37
     }
   },
-  "range": [
-    0,
-    37
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 37
       }
     },
-    "range": [
-      0,
-      37
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 37
           }
         },
-        "range": [
-          0,
-          37
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 13
             }
           },
-          "range": [
-            9,
-            13
-          ],
           "name": "test"
         },
         "generator": false,
@@ -91,10 +75,6 @@
               "column": 37
             }
           },
-          "range": [
-            16,
-            37
-          ],
           "body": [
             {
               "type": "ExpressionStatement",
@@ -110,10 +90,6 @@
                   "column": 30
                 }
               },
-              "range": [
-                17,
-                30
-              ],
               "expression": {
                 "type": "Literal",
                 "start": 17,
@@ -128,10 +104,6 @@
                     "column": 29
                   }
                 },
-                "range": [
-                  17,
-                  29
-                ],
                 "value": "use strict",
                 "rawValue": "use strict",
                 "raw": "'use strict'"
@@ -151,10 +123,6 @@
                   "column": 35
                 }
               },
-              "range": [
-                31,
-                35
-              ],
               "expression": {
                 "type": "Literal",
                 "start": 31,
@@ -169,10 +137,6 @@
                     "column": 34
                   }
                 },
-                "range": [
-                  31,
-                  34
-                ],
                 "value": 0,
                 "rawValue": 0,
                 "raw": "0o0"
@@ -182,5 +146,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/50/expected.json b/test/fixtures/harmony/uncategorised/50/expected.json
index 93ed633c02..a27dc04bfa 100644
--- a/test/fixtures/harmony/uncategorised/50/expected.json
+++ b/test/fixtures/harmony/uncategorised/50/expected.json
@@ -12,10 +12,6 @@
       "column": 17
     }
   },
-  "range": [
-    0,
-    17
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 17
       }
     },
-    "range": [
-      0,
-      17
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 17
           }
         },
-        "range": [
-          0,
-          17
-        ],
         "expression": {
           "type": "CallExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 17
             }
           },
-          "range": [
-            0,
-            17
-          ],
           "callee": {
             "type": "Identifier",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 3
               }
             },
-            "range": [
-              0,
-              3
-            ],
             "name": "foo"
           },
           "arguments": [
@@ -107,10 +87,6 @@
                   "column": 16
                 }
               },
-              "range": [
-                4,
-                16
-              ],
               "id": null,
               "generator": false,
               "expression": false,
@@ -129,10 +105,6 @@
                       "column": 6
                     }
                   },
-                  "range": [
-                    5,
-                    6
-                  ],
                   "name": "x"
                 },
                 {
@@ -149,10 +121,6 @@
                       "column": 9
                     }
                   },
-                  "range": [
-                    8,
-                    9
-                  ],
                   "name": "y"
                 }
               ],
@@ -170,10 +138,6 @@
                     "column": 16
                   }
                 },
-                "range": [
-                  14,
-                  16
-                ],
                 "body": []
               }
             }
@@ -181,5 +145,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/51/expected.json b/test/fixtures/harmony/uncategorised/51/expected.json
index 6e86eaf1c7..0fe0e61786 100644
--- a/test/fixtures/harmony/uncategorised/51/expected.json
+++ b/test/fixtures/harmony/uncategorised/51/expected.json
@@ -12,10 +12,6 @@
       "column": 12
     }
   },
-  "range": [
-    0,
-    12
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 12
       }
     },
-    "range": [
-      0,
-      12
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 12
           }
         },
-        "range": [
-          0,
-          12
-        ],
         "expression": {
           "type": "ArrowFunctionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            0,
-            12
-          ],
           "id": null,
           "generator": false,
           "expression": true,
@@ -90,10 +74,6 @@
                   "column": 2
                 }
               },
-              "range": [
-                1,
-                2
-              ],
               "name": "a"
             },
             {
@@ -110,10 +90,6 @@
                   "column": 5
                 }
               },
-              "range": [
-                4,
-                5
-              ],
               "name": "a"
             }
           ],
@@ -131,10 +107,6 @@
                 "column": 12
               }
             },
-            "range": [
-              10,
-              12
-            ],
             "value": 42,
             "rawValue": 42,
             "raw": "42"
@@ -142,5 +114,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/52/expected.json b/test/fixtures/harmony/uncategorised/52/expected.json
index 33eaaa3c07..bb2d92ab6e 100644
--- a/test/fixtures/harmony/uncategorised/52/expected.json
+++ b/test/fixtures/harmony/uncategorised/52/expected.json
@@ -12,10 +12,6 @@
       "column": 20
     }
   },
-  "range": [
-    0,
-    20
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 20
       }
     },
-    "range": [
-      0,
-      20
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 20
           }
         },
-        "range": [
-          0,
-          20
-        ],
         "expression": {
           "type": "AssignmentExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 20
             }
           },
-          "range": [
-            0,
-            20
-          ],
           "operator": "=",
           "left": {
             "type": "Identifier",
@@ -87,10 +71,6 @@
                 "column": 1
               }
             },
-            "range": [
-              0,
-              1
-            ],
             "name": "x"
           },
           "right": {
@@ -107,10 +87,6 @@
                 "column": 20
               }
             },
-            "range": [
-              4,
-              20
-            ],
             "properties": [
               {
                 "type": "Property",
@@ -126,10 +102,6 @@
                     "column": 18
                   }
                 },
-                "range": [
-                  6,
-                  18
-                ],
                 "method": true,
                 "shorthand": false,
                 "computed": false,
@@ -147,10 +119,6 @@
                       "column": 12
                     }
                   },
-                  "range": [
-                    6,
-                    12
-                  ],
                   "name": "method"
                 },
                 "kind": "init",
@@ -168,10 +136,6 @@
                       "column": 18
                     }
                   },
-                  "range": [
-                    12,
-                    18
-                  ],
                   "id": null,
                   "generator": false,
                   "expression": false,
@@ -190,10 +154,6 @@
                         "column": 18
                       }
                     },
-                    "range": [
-                      15,
-                      18
-                    ],
                     "body": []
                   }
                 }
@@ -203,5 +163,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/53/expected.json b/test/fixtures/harmony/uncategorised/53/expected.json
index 581d5f6e96..75665ddf61 100644
--- a/test/fixtures/harmony/uncategorised/53/expected.json
+++ b/test/fixtures/harmony/uncategorised/53/expected.json
@@ -12,10 +12,6 @@
       "column": 24
     }
   },
-  "range": [
-    0,
-    24
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 24
       }
     },
-    "range": [
-      0,
-      24
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 24
           }
         },
-        "range": [
-          0,
-          24
-        ],
         "expression": {
           "type": "AssignmentExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 24
             }
           },
-          "range": [
-            0,
-            24
-          ],
           "operator": "=",
           "left": {
             "type": "Identifier",
@@ -87,10 +71,6 @@
                 "column": 1
               }
             },
-            "range": [
-              0,
-              1
-            ],
             "name": "x"
           },
           "right": {
@@ -107,10 +87,6 @@
                 "column": 24
               }
             },
-            "range": [
-              4,
-              24
-            ],
             "properties": [
               {
                 "type": "Property",
@@ -126,10 +102,6 @@
                     "column": 22
                   }
                 },
-                "range": [
-                  6,
-                  22
-                ],
                 "method": true,
                 "shorthand": false,
                 "computed": false,
@@ -147,10 +119,6 @@
                       "column": 12
                     }
                   },
-                  "range": [
-                    6,
-                    12
-                  ],
                   "name": "method"
                 },
                 "kind": "init",
@@ -168,10 +136,6 @@
                       "column": 22
                     }
                   },
-                  "range": [
-                    12,
-                    22
-                  ],
                   "id": null,
                   "generator": false,
                   "expression": false,
@@ -190,10 +154,6 @@
                           "column": 17
                         }
                       },
-                      "range": [
-                        13,
-                        17
-                      ],
                       "name": "test"
                     }
                   ],
@@ -211,10 +171,6 @@
                         "column": 22
                       }
                     },
-                    "range": [
-                      19,
-                      22
-                    ],
                     "body": []
                   }
                 }
@@ -224,5 +180,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/54/expected.json b/test/fixtures/harmony/uncategorised/54/expected.json
index 21acd849fa..8d4c180d13 100644
--- a/test/fixtures/harmony/uncategorised/54/expected.json
+++ b/test/fixtures/harmony/uncategorised/54/expected.json
@@ -12,10 +12,6 @@
       "column": 22
     }
   },
-  "range": [
-    0,
-    22
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 22
       }
     },
-    "range": [
-      0,
-      22
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 22
           }
         },
-        "range": [
-          0,
-          22
-        ],
         "expression": {
           "type": "AssignmentExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 22
             }
           },
-          "range": [
-            0,
-            22
-          ],
           "operator": "=",
           "left": {
             "type": "Identifier",
@@ -87,10 +71,6 @@
                 "column": 1
               }
             },
-            "range": [
-              0,
-              1
-            ],
             "name": "x"
           },
           "right": {
@@ -107,10 +87,6 @@
                 "column": 22
               }
             },
-            "range": [
-              4,
-              22
-            ],
             "properties": [
               {
                 "type": "Property",
@@ -126,10 +102,6 @@
                     "column": 20
                   }
                 },
-                "range": [
-                  6,
-                  20
-                ],
                 "method": true,
                 "shorthand": false,
                 "computed": false,
@@ -147,10 +119,6 @@
                       "column": 14
                     }
                   },
-                  "range": [
-                    6,
-                    14
-                  ],
                   "value": "method",
                   "rawValue": "method",
                   "raw": "'method'"
@@ -170,10 +138,6 @@
                       "column": 20
                     }
                   },
-                  "range": [
-                    14,
-                    20
-                  ],
                   "id": null,
                   "generator": false,
                   "expression": false,
@@ -192,10 +156,6 @@
                         "column": 20
                       }
                     },
-                    "range": [
-                      17,
-                      20
-                    ],
                     "body": []
                   }
                 }
@@ -205,5 +165,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/55/expected.json b/test/fixtures/harmony/uncategorised/55/expected.json
index 326e97db80..442afea2b9 100644
--- a/test/fixtures/harmony/uncategorised/55/expected.json
+++ b/test/fixtures/harmony/uncategorised/55/expected.json
@@ -12,10 +12,6 @@
       "column": 17
     }
   },
-  "range": [
-    0,
-    17
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 17
       }
     },
-    "range": [
-      0,
-      17
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 17
           }
         },
-        "range": [
-          0,
-          17
-        ],
         "expression": {
           "type": "AssignmentExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 17
             }
           },
-          "range": [
-            0,
-            17
-          ],
           "operator": "=",
           "left": {
             "type": "Identifier",
@@ -87,10 +71,6 @@
                 "column": 1
               }
             },
-            "range": [
-              0,
-              1
-            ],
             "name": "x"
           },
           "right": {
@@ -107,10 +87,6 @@
                 "column": 17
               }
             },
-            "range": [
-              4,
-              17
-            ],
             "properties": [
               {
                 "type": "Property",
@@ -126,10 +102,6 @@
                     "column": 15
                   }
                 },
-                "range": [
-                  6,
-                  15
-                ],
                 "method": true,
                 "shorthand": false,
                 "computed": false,
@@ -147,10 +119,6 @@
                       "column": 9
                     }
                   },
-                  "range": [
-                    6,
-                    9
-                  ],
                   "name": "get"
                 },
                 "kind": "init",
@@ -168,10 +136,6 @@
                       "column": 15
                     }
                   },
-                  "range": [
-                    9,
-                    15
-                  ],
                   "id": null,
                   "generator": false,
                   "expression": false,
@@ -190,10 +154,6 @@
                         "column": 15
                       }
                     },
-                    "range": [
-                      12,
-                      15
-                    ],
                     "body": []
                   }
                 }
@@ -203,5 +163,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/56/expected.json b/test/fixtures/harmony/uncategorised/56/expected.json
index 4c48bca991..3545909350 100644
--- a/test/fixtures/harmony/uncategorised/56/expected.json
+++ b/test/fixtures/harmony/uncategorised/56/expected.json
@@ -12,10 +12,6 @@
       "column": 17
     }
   },
-  "range": [
-    0,
-    17
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 17
       }
     },
-    "range": [
-      0,
-      17
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 17
           }
         },
-        "range": [
-          0,
-          17
-        ],
         "expression": {
           "type": "AssignmentExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 17
             }
           },
-          "range": [
-            0,
-            17
-          ],
           "operator": "=",
           "left": {
             "type": "Identifier",
@@ -87,10 +71,6 @@
                 "column": 1
               }
             },
-            "range": [
-              0,
-              1
-            ],
             "name": "x"
           },
           "right": {
@@ -107,10 +87,6 @@
                 "column": 17
               }
             },
-            "range": [
-              4,
-              17
-            ],
             "properties": [
               {
                 "type": "Property",
@@ -126,10 +102,6 @@
                     "column": 15
                   }
                 },
-                "range": [
-                  6,
-                  15
-                ],
                 "method": true,
                 "shorthand": false,
                 "computed": false,
@@ -147,10 +119,6 @@
                       "column": 9
                     }
                   },
-                  "range": [
-                    6,
-                    9
-                  ],
                   "name": "set"
                 },
                 "kind": "init",
@@ -168,10 +136,6 @@
                       "column": 15
                     }
                   },
-                  "range": [
-                    9,
-                    15
-                  ],
                   "id": null,
                   "generator": false,
                   "expression": false,
@@ -190,10 +154,6 @@
                         "column": 15
                       }
                     },
-                    "range": [
-                      12,
-                      15
-                    ],
                     "body": []
                   }
                 }
@@ -203,5 +163,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/57/expected.json b/test/fixtures/harmony/uncategorised/57/expected.json
index e129175314..8dd4aace6c 100644
--- a/test/fixtures/harmony/uncategorised/57/expected.json
+++ b/test/fixtures/harmony/uncategorised/57/expected.json
@@ -12,10 +12,6 @@
       "column": 20
     }
   },
-  "range": [
-    0,
-    20
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 20
       }
     },
-    "range": [
-      0,
-      20
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 20
           }
         },
-        "range": [
-          0,
-          20
-        ],
         "expression": {
           "type": "ComprehensionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 20
             }
           },
-          "range": [
-            0,
-            20
-          ],
           "blocks": [
             {
               "type": "ComprehensionBlock",
@@ -87,10 +71,6 @@
                   "column": 17
                 }
               },
-              "range": [
-                1,
-                17
-              ],
               "left": {
                 "type": "Identifier",
                 "start": 6,
@@ -105,10 +85,6 @@
                     "column": 7
                   }
                 },
-                "range": [
-                  6,
-                  7
-                ],
                 "name": "x"
               },
               "right": {
@@ -125,10 +101,6 @@
                     "column": 16
                   }
                 },
-                "range": [
-                  11,
-                  16
-                ],
                 "name": "array"
               }
             }
@@ -148,15 +120,12 @@
                 "column": 19
               }
             },
-            "range": [
-              18,
-              19
-            ],
             "name": "x"
           },
           "generator": false
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/58/expected.json b/test/fixtures/harmony/uncategorised/58/expected.json
index ed807dd064..26450dfeb4 100644
--- a/test/fixtures/harmony/uncategorised/58/expected.json
+++ b/test/fixtures/harmony/uncategorised/58/expected.json
@@ -12,10 +12,6 @@
       "column": 54
     }
   },
-  "range": [
-    0,
-    54
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 54
       }
     },
-    "range": [
-      0,
-      54
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 54
           }
         },
-        "range": [
-          0,
-          54
-        ],
         "expression": {
           "type": "ComprehensionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 54
             }
           },
-          "range": [
-            0,
-            54
-          ],
           "blocks": [
             {
               "type": "ComprehensionBlock",
@@ -87,10 +71,6 @@
                   "column": 17
                 }
               },
-              "range": [
-                1,
-                17
-              ],
               "left": {
                 "type": "Identifier",
                 "start": 6,
@@ -105,10 +85,6 @@
                     "column": 7
                   }
                 },
-                "range": [
-                  6,
-                  7
-                ],
                 "name": "x"
               },
               "right": {
@@ -125,10 +101,6 @@
                     "column": 16
                   }
                 },
-                "range": [
-                  11,
-                  16
-                ],
                 "name": "array"
               }
             },
@@ -146,10 +118,6 @@
                   "column": 35
                 }
               },
-              "range": [
-                18,
-                35
-              ],
               "left": {
                 "type": "Identifier",
                 "start": 23,
@@ -164,10 +132,6 @@
                     "column": 24
                   }
                 },
-                "range": [
-                  23,
-                  24
-                ],
                 "name": "y"
               },
               "right": {
@@ -184,10 +148,6 @@
                     "column": 34
                   }
                 },
-                "range": [
-                  28,
-                  34
-                ],
                 "name": "array2"
               }
             }
@@ -206,10 +166,6 @@
                 "column": 50
               }
             },
-            "range": [
-              40,
-              50
-            ],
             "left": {
               "type": "Identifier",
               "start": 40,
@@ -224,10 +180,6 @@
                   "column": 41
                 }
               },
-              "range": [
-                40,
-                41
-              ],
               "name": "x"
             },
             "operator": "===",
@@ -245,10 +197,6 @@
                   "column": 50
                 }
               },
-              "range": [
-                46,
-                50
-              ],
               "name": "test"
             }
           },
@@ -266,15 +214,12 @@
                 "column": 53
               }
             },
-            "range": [
-              52,
-              53
-            ],
             "name": "x"
           },
           "generator": false
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/59/expected.json b/test/fixtures/harmony/uncategorised/59/expected.json
index e97ed0e7c0..438b7a59b1 100644
--- a/test/fixtures/harmony/uncategorised/59/expected.json
+++ b/test/fixtures/harmony/uncategorised/59/expected.json
@@ -12,10 +12,6 @@
       "column": 54
     }
   },
-  "range": [
-    0,
-    54
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 54
       }
     },
-    "range": [
-      0,
-      54
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 54
           }
         },
-        "range": [
-          0,
-          54
-        ],
         "expression": {
           "type": "ComprehensionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 54
             }
           },
-          "range": [
-            0,
-            54
-          ],
           "blocks": [
             {
               "type": "ComprehensionBlock",
@@ -87,10 +71,6 @@
                   "column": 17
                 }
               },
-              "range": [
-                1,
-                17
-              ],
               "left": {
                 "type": "Identifier",
                 "start": 6,
@@ -105,10 +85,6 @@
                     "column": 7
                   }
                 },
-                "range": [
-                  6,
-                  7
-                ],
                 "name": "x"
               },
               "right": {
@@ -125,10 +101,6 @@
                     "column": 16
                   }
                 },
-                "range": [
-                  11,
-                  16
-                ],
                 "name": "array"
               }
             },
@@ -146,10 +118,6 @@
                   "column": 35
                 }
               },
-              "range": [
-                18,
-                35
-              ],
               "left": {
                 "type": "Identifier",
                 "start": 23,
@@ -164,10 +132,6 @@
                     "column": 24
                   }
                 },
-                "range": [
-                  23,
-                  24
-                ],
                 "name": "y"
               },
               "right": {
@@ -184,10 +148,6 @@
                     "column": 34
                   }
                 },
-                "range": [
-                  28,
-                  34
-                ],
                 "name": "array2"
               }
             }
@@ -206,10 +166,6 @@
                 "column": 50
               }
             },
-            "range": [
-              40,
-              50
-            ],
             "left": {
               "type": "Identifier",
               "start": 40,
@@ -224,10 +180,6 @@
                   "column": 41
                 }
               },
-              "range": [
-                40,
-                41
-              ],
               "name": "x"
             },
             "operator": "===",
@@ -245,10 +197,6 @@
                   "column": 50
                 }
               },
-              "range": [
-                46,
-                50
-              ],
               "name": "test"
             }
           },
@@ -266,15 +214,12 @@
                 "column": 53
               }
             },
-            "range": [
-              52,
-              53
-            ],
             "name": "x"
           },
           "generator": true
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/6/expected.json b/test/fixtures/harmony/uncategorised/6/expected.json
index 36e50d9f58..920e80aa74 100644
--- a/test/fixtures/harmony/uncategorised/6/expected.json
+++ b/test/fixtures/harmony/uncategorised/6/expected.json
@@ -12,10 +12,6 @@
       "column": 3
     }
   },
-  "range": [
-    0,
-    3
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 3
       }
     },
-    "range": [
-      0,
-      3
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 3
           }
         },
-        "range": [
-          0,
-          3
-        ],
         "expression": {
           "type": "Literal",
           "start": 0,
@@ -68,15 +56,12 @@
               "column": 3
             }
           },
-          "range": [
-            0,
-            3
-          ],
           "value": 2,
           "rawValue": 2,
           "raw": "0o2"
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/60/expected.json b/test/fixtures/harmony/uncategorised/60/expected.json
index 4b98f8cb7f..05feccbca7 100644
--- a/test/fixtures/harmony/uncategorised/60/expected.json
+++ b/test/fixtures/harmony/uncategorised/60/expected.json
@@ -12,10 +12,6 @@
       "column": 68
     }
   },
-  "range": [
-    0,
-    68
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 68
       }
     },
-    "range": [
-      0,
-      68
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 68
           }
         },
-        "range": [
-          0,
-          68
-        ],
         "expression": {
           "type": "ComprehensionExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 68
             }
           },
-          "range": [
-            0,
-            68
-          ],
           "blocks": [
             {
               "type": "ComprehensionBlock",
@@ -87,10 +71,6 @@
                   "column": 20
                 }
               },
-              "range": [
-                1,
-                20
-              ],
               "left": {
                 "type": "ArrayPattern",
                 "start": 6,
@@ -105,10 +85,6 @@
                     "column": 10
                   }
                 },
-                "range": [
-                  6,
-                  10
-                ],
                 "elements": [
                   null,
                   {
@@ -125,10 +101,6 @@
                         "column": 9
                       }
                     },
-                    "range": [
-                      8,
-                      9
-                    ],
                     "name": "x"
                   }
                 ]
@@ -147,10 +119,6 @@
                     "column": 19
                   }
                 },
-                "range": [
-                  14,
-                  19
-                ],
                 "name": "array"
               }
             },
@@ -168,10 +136,6 @@
                   "column": 65
                 }
               },
-              "range": [
-                21,
-                65
-              ],
               "left": {
                 "type": "ObjectPattern",
                 "start": 26,
@@ -186,10 +150,6 @@
                     "column": 54
                   }
                 },
-                "range": [
-                  26,
-                  54
-                ],
                 "properties": [
                   {
                     "type": "Property",
@@ -205,10 +165,6 @@
                         "column": 39
                       }
                     },
-                    "range": [
-                      27,
-                      39
-                    ],
                     "method": false,
                     "shorthand": false,
                     "computed": true,
@@ -226,10 +182,6 @@
                           "column": 35
                         }
                       },
-                      "range": [
-                        28,
-                        35
-                      ],
                       "object": {
                         "type": "Identifier",
                         "start": 28,
@@ -244,10 +196,6 @@
                             "column": 33
                           }
                         },
-                        "range": [
-                          28,
-                          33
-                        ],
                         "name": "start"
                       },
                       "property": {
@@ -264,10 +212,6 @@
                             "column": 35
                           }
                         },
-                        "range": [
-                          34,
-                          35
-                        ],
                         "name": "x"
                       },
                       "computed": false
@@ -286,10 +230,6 @@
                           "column": 39
                         }
                       },
-                      "range": [
-                        38,
-                        39
-                      ],
                       "name": "x"
                     },
                     "kind": "init"
@@ -308,10 +248,6 @@
                         "column": 53
                       }
                     },
-                    "range": [
-                      41,
-                      53
-                    ],
                     "method": false,
                     "shorthand": false,
                     "computed": true,
@@ -329,10 +265,6 @@
                           "column": 49
                         }
                       },
-                      "range": [
-                        42,
-                        49
-                      ],
                       "object": {
                         "type": "Identifier",
                         "start": 42,
@@ -347,10 +279,6 @@
                             "column": 47
                           }
                         },
-                        "range": [
-                          42,
-                          47
-                        ],
                         "name": "start"
                       },
                       "property": {
@@ -367,10 +295,6 @@
                             "column": 49
                           }
                         },
-                        "range": [
-                          48,
-                          49
-                        ],
                         "name": "y"
                       },
                       "computed": false
@@ -389,10 +313,6 @@
                           "column": 53
                         }
                       },
-                      "range": [
-                        52,
-                        53
-                      ],
                       "name": "y"
                     },
                     "kind": "init"
@@ -413,10 +333,6 @@
                     "column": 64
                   }
                 },
-                "range": [
-                  58,
-                  64
-                ],
                 "name": "array2"
               }
             }
@@ -436,15 +352,12 @@
                 "column": 67
               }
             },
-            "range": [
-              66,
-              67
-            ],
             "name": "x"
           },
           "generator": false
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/61/expected.json b/test/fixtures/harmony/uncategorised/61/expected.json
index d08a3bab20..592ee20049 100644
--- a/test/fixtures/harmony/uncategorised/61/expected.json
+++ b/test/fixtures/harmony/uncategorised/61/expected.json
@@ -12,10 +12,6 @@
       "column": 12
     }
   },
-  "range": [
-    0,
-    12
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 12
       }
     },
-    "range": [
-      0,
-      12
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 12
           }
         },
-        "range": [
-          0,
-          12
-        ],
         "expression": {
           "type": "AssignmentExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 12
             }
           },
-          "range": [
-            0,
-            12
-          ],
           "operator": "=",
           "left": {
             "type": "Identifier",
@@ -87,10 +71,6 @@
                 "column": 1
               }
             },
-            "range": [
-              0,
-              1
-            ],
             "name": "x"
           },
           "right": {
@@ -107,10 +87,6 @@
                 "column": 12
               }
             },
-            "range": [
-              4,
-              12
-            ],
             "properties": [
               {
                 "type": "Property",
@@ -126,10 +102,6 @@
                     "column": 7
                   }
                 },
-                "range": [
-                  6,
-                  7
-                ],
                 "method": false,
                 "shorthand": true,
                 "computed": false,
@@ -147,10 +119,6 @@
                       "column": 7
                     }
                   },
-                  "range": [
-                    6,
-                    7
-                  ],
                   "name": "y"
                 },
                 "kind": "init",
@@ -168,10 +136,6 @@
                       "column": 7
                     }
                   },
-                  "range": [
-                    6,
-                    7
-                  ],
                   "name": "y"
                 }
               },
@@ -189,10 +153,6 @@
                     "column": 10
                   }
                 },
-                "range": [
-                  9,
-                  10
-                ],
                 "method": false,
                 "shorthand": true,
                 "computed": false,
@@ -210,10 +170,6 @@
                       "column": 10
                     }
                   },
-                  "range": [
-                    9,
-                    10
-                  ],
                   "name": "z"
                 },
                 "kind": "init",
@@ -231,10 +187,6 @@
                       "column": 10
                     }
                   },
-                  "range": [
-                    9,
-                    10
-                  ],
                   "name": "z"
                 }
               }
@@ -243,5 +195,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/62/expected.json b/test/fixtures/harmony/uncategorised/62/expected.json
index 4b1af86ae9..6e74cfdbcb 100644
--- a/test/fixtures/harmony/uncategorised/62/expected.json
+++ b/test/fixtures/harmony/uncategorised/62/expected.json
@@ -12,10 +12,6 @@
       "column": 15
     }
   },
-  "range": [
-    0,
-    15
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 15
       }
     },
-    "range": [
-      0,
-      15
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 15
           }
         },
-        "range": [
-          0,
-          15
-        ],
         "expression": {
           "type": "AssignmentExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 15
             }
           },
-          "range": [
-            0,
-            15
-          ],
           "operator": "=",
           "left": {
             "type": "ArrayPattern",
@@ -87,10 +71,6 @@
                 "column": 6
               }
             },
-            "range": [
-              0,
-              6
-            ],
             "elements": [
               {
                 "type": "Identifier",
@@ -106,10 +86,6 @@
                     "column": 2
                   }
                 },
-                "range": [
-                  1,
-                  2
-                ],
                 "name": "a"
               },
               {
@@ -126,10 +102,6 @@
                     "column": 5
                   }
                 },
-                "range": [
-                  4,
-                  5
-                ],
                 "name": "b"
               }
             ]
@@ -148,10 +120,6 @@
                 "column": 15
               }
             },
-            "range": [
-              9,
-              15
-            ],
             "elements": [
               {
                 "type": "Identifier",
@@ -167,10 +135,6 @@
                     "column": 11
                   }
                 },
-                "range": [
-                  10,
-                  11
-                ],
                 "name": "b"
               },
               {
@@ -187,10 +151,6 @@
                     "column": 14
                   }
                 },
-                "range": [
-                  13,
-                  14
-                ],
                 "name": "a"
               }
             ]
@@ -198,5 +158,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/63/expected.json b/test/fixtures/harmony/uncategorised/63/expected.json
index 7f0d7a7c01..f8d73fc297 100644
--- a/test/fixtures/harmony/uncategorised/63/expected.json
+++ b/test/fixtures/harmony/uncategorised/63/expected.json
@@ -12,10 +12,6 @@
       "column": 14
     }
   },
-  "range": [
-    0,
-    14
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 14
       }
     },
-    "range": [
-      0,
-      14
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 14
           }
         },
-        "range": [
-          0,
-          14
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 14
               }
             },
-            "range": [
-              6,
-              14
-            ],
             "id": {
               "type": "ObjectPattern",
               "start": 6,
@@ -87,10 +71,6 @@
                   "column": 9
                 }
               },
-              "range": [
-                6,
-                9
-              ],
               "properties": [
                 {
                   "type": "Property",
@@ -106,10 +86,6 @@
                       "column": 8
                     }
                   },
-                  "range": [
-                    7,
-                    8
-                  ],
                   "method": false,
                   "shorthand": true,
                   "computed": false,
@@ -127,10 +103,6 @@
                         "column": 8
                       }
                     },
-                    "range": [
-                      7,
-                      8
-                    ],
                     "name": "a"
                   },
                   "kind": "init",
@@ -148,10 +120,6 @@
                         "column": 8
                       }
                     },
-                    "range": [
-                      7,
-                      8
-                    ],
                     "name": "a"
                   }
                 }
@@ -171,10 +139,6 @@
                   "column": 14
                 }
               },
-              "range": [
-                12,
-                14
-              ],
               "properties": []
             }
           }
@@ -182,5 +146,6 @@
         "kind": "const"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/64/expected.json b/test/fixtures/harmony/uncategorised/64/expected.json
index a4996f3354..d970cbce76 100644
--- a/test/fixtures/harmony/uncategorised/64/expected.json
+++ b/test/fixtures/harmony/uncategorised/64/expected.json
@@ -12,10 +12,6 @@
       "column": 14
     }
   },
-  "range": [
-    0,
-    14
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 14
       }
     },
-    "range": [
-      0,
-      14
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 14
           }
         },
-        "range": [
-          0,
-          14
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 14
               }
             },
-            "range": [
-              6,
-              14
-            ],
             "id": {
               "type": "ArrayPattern",
               "start": 6,
@@ -87,10 +71,6 @@
                   "column": 9
                 }
               },
-              "range": [
-                6,
-                9
-              ],
               "elements": [
                 {
                   "type": "Identifier",
@@ -106,10 +86,6 @@
                       "column": 8
                     }
                   },
-                  "range": [
-                    7,
-                    8
-                  ],
                   "name": "a"
                 }
               ]
@@ -128,10 +104,6 @@
                   "column": 14
                 }
               },
-              "range": [
-                12,
-                14
-              ],
               "elements": []
             }
           }
@@ -139,5 +111,6 @@
         "kind": "const"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/65/expected.json b/test/fixtures/harmony/uncategorised/65/expected.json
index d70c189da7..beb62b1d35 100644
--- a/test/fixtures/harmony/uncategorised/65/expected.json
+++ b/test/fixtures/harmony/uncategorised/65/expected.json
@@ -12,10 +12,6 @@
       "column": 12
     }
   },
-  "range": [
-    0,
-    12
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 12
       }
     },
-    "range": [
-      0,
-      12
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 12
           }
         },
-        "range": [
-          0,
-          12
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 12
               }
             },
-            "range": [
-              4,
-              12
-            ],
             "id": {
               "type": "ObjectPattern",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 7
                 }
               },
-              "range": [
-                4,
-                7
-              ],
               "properties": [
                 {
                   "type": "Property",
@@ -106,10 +86,6 @@
                       "column": 6
                     }
                   },
-                  "range": [
-                    5,
-                    6
-                  ],
                   "method": false,
                   "shorthand": true,
                   "computed": false,
@@ -127,10 +103,6 @@
                         "column": 6
                       }
                     },
-                    "range": [
-                      5,
-                      6
-                    ],
                     "name": "a"
                   },
                   "kind": "init",
@@ -148,10 +120,6 @@
                         "column": 6
                       }
                     },
-                    "range": [
-                      5,
-                      6
-                    ],
                     "name": "a"
                   }
                 }
@@ -171,10 +139,6 @@
                   "column": 12
                 }
               },
-              "range": [
-                10,
-                12
-              ],
               "properties": []
             }
           }
@@ -182,5 +146,6 @@
         "kind": "let"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/66/expected.json b/test/fixtures/harmony/uncategorised/66/expected.json
index b4895bf1c6..58be00e51c 100644
--- a/test/fixtures/harmony/uncategorised/66/expected.json
+++ b/test/fixtures/harmony/uncategorised/66/expected.json
@@ -12,10 +12,6 @@
       "column": 12
     }
   },
-  "range": [
-    0,
-    12
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 12
       }
     },
-    "range": [
-      0,
-      12
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 12
           }
         },
-        "range": [
-          0,
-          12
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 12
               }
             },
-            "range": [
-              4,
-              12
-            ],
             "id": {
               "type": "ArrayPattern",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 7
                 }
               },
-              "range": [
-                4,
-                7
-              ],
               "elements": [
                 {
                   "type": "Identifier",
@@ -106,10 +86,6 @@
                       "column": 6
                     }
                   },
-                  "range": [
-                    5,
-                    6
-                  ],
                   "name": "a"
                 }
               ]
@@ -128,10 +104,6 @@
                   "column": 12
                 }
               },
-              "range": [
-                10,
-                12
-              ],
               "elements": []
             }
           }
@@ -139,5 +111,6 @@
         "kind": "let"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/67/expected.json b/test/fixtures/harmony/uncategorised/67/expected.json
index e05e2a32aa..870ab05ccc 100644
--- a/test/fixtures/harmony/uncategorised/67/expected.json
+++ b/test/fixtures/harmony/uncategorised/67/expected.json
@@ -12,10 +12,6 @@
       "column": 12
     }
   },
-  "range": [
-    0,
-    12
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 12
       }
     },
-    "range": [
-      0,
-      12
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 12
           }
         },
-        "range": [
-          0,
-          12
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 12
               }
             },
-            "range": [
-              4,
-              12
-            ],
             "id": {
               "type": "ObjectPattern",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 7
                 }
               },
-              "range": [
-                4,
-                7
-              ],
               "properties": [
                 {
                   "type": "Property",
@@ -106,10 +86,6 @@
                       "column": 6
                     }
                   },
-                  "range": [
-                    5,
-                    6
-                  ],
                   "method": false,
                   "shorthand": true,
                   "computed": false,
@@ -127,10 +103,6 @@
                         "column": 6
                       }
                     },
-                    "range": [
-                      5,
-                      6
-                    ],
                     "name": "a"
                   },
                   "kind": "init",
@@ -148,10 +120,6 @@
                         "column": 6
                       }
                     },
-                    "range": [
-                      5,
-                      6
-                    ],
                     "name": "a"
                   }
                 }
@@ -171,10 +139,6 @@
                   "column": 12
                 }
               },
-              "range": [
-                10,
-                12
-              ],
               "properties": []
             }
           }
@@ -182,5 +146,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/68/expected.json b/test/fixtures/harmony/uncategorised/68/expected.json
index 788e3e11ee..aabef1030c 100644
--- a/test/fixtures/harmony/uncategorised/68/expected.json
+++ b/test/fixtures/harmony/uncategorised/68/expected.json
@@ -12,10 +12,6 @@
       "column": 12
     }
   },
-  "range": [
-    0,
-    12
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 12
       }
     },
-    "range": [
-      0,
-      12
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 12
           }
         },
-        "range": [
-          0,
-          12
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 12
               }
             },
-            "range": [
-              4,
-              12
-            ],
             "id": {
               "type": "ArrayPattern",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 7
                 }
               },
-              "range": [
-                4,
-                7
-              ],
               "elements": [
                 {
                   "type": "Identifier",
@@ -106,10 +86,6 @@
                       "column": 6
                     }
                   },
-                  "range": [
-                    5,
-                    6
-                  ],
                   "name": "a"
                 }
               ]
@@ -128,10 +104,6 @@
                   "column": 12
                 }
               },
-              "range": [
-                10,
-                12
-              ],
               "elements": []
             }
           }
@@ -139,5 +111,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/69/expected.json b/test/fixtures/harmony/uncategorised/69/expected.json
index 1a30aac349..bad27b27c6 100644
--- a/test/fixtures/harmony/uncategorised/69/expected.json
+++ b/test/fixtures/harmony/uncategorised/69/expected.json
@@ -12,10 +12,6 @@
       "column": 16
     }
   },
-  "range": [
-    0,
-    16
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 16
       }
     },
-    "range": [
-      0,
-      16
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 16
           }
         },
-        "range": [
-          0,
-          16
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 16
               }
             },
-            "range": [
-              6,
-              16
-            ],
             "id": {
               "type": "ObjectPattern",
               "start": 6,
@@ -87,10 +71,6 @@
                   "column": 11
                 }
               },
-              "range": [
-                6,
-                11
-              ],
               "properties": [
                 {
                   "type": "Property",
@@ -106,10 +86,6 @@
                       "column": 10
                     }
                   },
-                  "range": [
-                    7,
-                    10
-                  ],
                   "method": false,
                   "shorthand": false,
                   "computed": false,
@@ -127,10 +103,6 @@
                         "column": 8
                       }
                     },
-                    "range": [
-                      7,
-                      8
-                    ],
                     "name": "a"
                   },
                   "value": {
@@ -147,10 +119,6 @@
                         "column": 10
                       }
                     },
-                    "range": [
-                      9,
-                      10
-                    ],
                     "name": "b"
                   },
                   "kind": "init"
@@ -171,10 +139,6 @@
                   "column": 16
                 }
               },
-              "range": [
-                14,
-                16
-              ],
               "properties": []
             }
           }
@@ -182,5 +146,6 @@
         "kind": "const"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/7/expected.json b/test/fixtures/harmony/uncategorised/7/expected.json
index 026879314b..32784e3d69 100644
--- a/test/fixtures/harmony/uncategorised/7/expected.json
+++ b/test/fixtures/harmony/uncategorised/7/expected.json
@@ -12,10 +12,6 @@
       "column": 4
     }
   },
-  "range": [
-    0,
-    4
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 4
       }
     },
-    "range": [
-      0,
-      4
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 4
           }
         },
-        "range": [
-          0,
-          4
-        ],
         "expression": {
           "type": "Literal",
           "start": 0,
@@ -68,15 +56,12 @@
               "column": 4
             }
           },
-          "range": [
-            0,
-            4
-          ],
           "value": 10,
           "rawValue": 10,
           "raw": "0o12"
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/70/expected.json b/test/fixtures/harmony/uncategorised/70/expected.json
index 987a9652b3..37cca27feb 100644
--- a/test/fixtures/harmony/uncategorised/70/expected.json
+++ b/test/fixtures/harmony/uncategorised/70/expected.json
@@ -12,10 +12,6 @@
       "column": 14
     }
   },
-  "range": [
-    0,
-    14
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 14
       }
     },
-    "range": [
-      0,
-      14
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 14
           }
         },
-        "range": [
-          0,
-          14
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 14
               }
             },
-            "range": [
-              4,
-              14
-            ],
             "id": {
               "type": "ObjectPattern",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 9
                 }
               },
-              "range": [
-                4,
-                9
-              ],
               "properties": [
                 {
                   "type": "Property",
@@ -106,10 +86,6 @@
                       "column": 8
                     }
                   },
-                  "range": [
-                    5,
-                    8
-                  ],
                   "method": false,
                   "shorthand": false,
                   "computed": false,
@@ -127,10 +103,6 @@
                         "column": 6
                       }
                     },
-                    "range": [
-                      5,
-                      6
-                    ],
                     "name": "a"
                   },
                   "value": {
@@ -147,10 +119,6 @@
                         "column": 8
                       }
                     },
-                    "range": [
-                      7,
-                      8
-                    ],
                     "name": "b"
                   },
                   "kind": "init"
@@ -171,10 +139,6 @@
                   "column": 14
                 }
               },
-              "range": [
-                12,
-                14
-              ],
               "properties": []
             }
           }
@@ -182,5 +146,6 @@
         "kind": "let"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/71/expected.json b/test/fixtures/harmony/uncategorised/71/expected.json
index a995dff275..6a0f96a0d8 100644
--- a/test/fixtures/harmony/uncategorised/71/expected.json
+++ b/test/fixtures/harmony/uncategorised/71/expected.json
@@ -12,10 +12,6 @@
       "column": 14
     }
   },
-  "range": [
-    0,
-    14
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 14
       }
     },
-    "range": [
-      0,
-      14
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 14
           }
         },
-        "range": [
-          0,
-          14
-        ],
         "declarations": [
           {
             "type": "VariableDeclarator",
@@ -69,10 +57,6 @@
                 "column": 14
               }
             },
-            "range": [
-              4,
-              14
-            ],
             "id": {
               "type": "ObjectPattern",
               "start": 4,
@@ -87,10 +71,6 @@
                   "column": 9
                 }
               },
-              "range": [
-                4,
-                9
-              ],
               "properties": [
                 {
                   "type": "Property",
@@ -106,10 +86,6 @@
                       "column": 8
                     }
                   },
-                  "range": [
-                    5,
-                    8
-                  ],
                   "method": false,
                   "shorthand": false,
                   "computed": false,
@@ -127,10 +103,6 @@
                         "column": 6
                       }
                     },
-                    "range": [
-                      5,
-                      6
-                    ],
                     "name": "a"
                   },
                   "value": {
@@ -147,10 +119,6 @@
                         "column": 8
                       }
                     },
-                    "range": [
-                      7,
-                      8
-                    ],
                     "name": "b"
                   },
                   "kind": "init"
@@ -171,10 +139,6 @@
                   "column": 14
                 }
               },
-              "range": [
-                12,
-                14
-              ],
               "properties": []
             }
           }
@@ -182,5 +146,6 @@
         "kind": "var"
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/72/expected.json b/test/fixtures/harmony/uncategorised/72/expected.json
index 1760b19a1a..1bd46b7ac0 100644
--- a/test/fixtures/harmony/uncategorised/72/expected.json
+++ b/test/fixtures/harmony/uncategorised/72/expected.json
@@ -12,10 +12,6 @@
       "column": 19
     }
   },
-  "range": [
-    0,
-    19
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 19
       }
     },
-    "range": [
-      0,
-      19
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 19
           }
         },
-        "range": [
-          0,
-          19
-        ],
         "declaration": {
           "type": "VariableDeclaration",
           "start": 7,
@@ -68,10 +56,6 @@
               "column": 19
             }
           },
-          "range": [
-            7,
-            19
-          ],
           "declarations": [
             {
               "type": "VariableDeclarator",
@@ -87,10 +71,6 @@
                   "column": 19
                 }
               },
-              "range": [
-                11,
-                19
-              ],
               "id": {
                 "type": "Identifier",
                 "start": 11,
@@ -105,10 +85,6 @@
                     "column": 19
                   }
                 },
-                "range": [
-                  11,
-                  19
-                ],
                 "name": "document"
               },
               "init": null
@@ -120,5 +96,6 @@
         "source": null
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/73/expected.json b/test/fixtures/harmony/uncategorised/73/expected.json
index 5482472d2e..3bfdd45a05 100644
--- a/test/fixtures/harmony/uncategorised/73/expected.json
+++ b/test/fixtures/harmony/uncategorised/73/expected.json
@@ -12,10 +12,6 @@
       "column": 25
     }
   },
-  "range": [
-    0,
-    25
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 25
       }
     },
-    "range": [
-      0,
-      25
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 25
           }
         },
-        "range": [
-          0,
-          25
-        ],
         "declaration": {
           "type": "VariableDeclaration",
           "start": 7,
@@ -68,10 +56,6 @@
               "column": 25
             }
           },
-          "range": [
-            7,
-            25
-          ],
           "declarations": [
             {
               "type": "VariableDeclarator",
@@ -87,10 +71,6 @@
                   "column": 25
                 }
               },
-              "range": [
-                11,
-                25
-              ],
               "id": {
                 "type": "Identifier",
                 "start": 11,
@@ -105,10 +85,6 @@
                     "column": 19
                   }
                 },
-                "range": [
-                  11,
-                  19
-                ],
                 "name": "document"
               },
               "init": {
@@ -125,10 +101,6 @@
                     "column": 25
                   }
                 },
-                "range": [
-                  22,
-                  25
-                ],
                 "properties": []
               }
             }
@@ -139,5 +111,6 @@
         "source": null
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/74/expected.json b/test/fixtures/harmony/uncategorised/74/expected.json
index ebb74ce067..83501be44d 100644
--- a/test/fixtures/harmony/uncategorised/74/expected.json
+++ b/test/fixtures/harmony/uncategorised/74/expected.json
@@ -12,10 +12,6 @@
       "column": 19
     }
   },
-  "range": [
-    0,
-    19
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 19
       }
     },
-    "range": [
-      0,
-      19
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 19
           }
         },
-        "range": [
-          0,
-          19
-        ],
         "declaration": {
           "type": "VariableDeclaration",
           "start": 7,
@@ -68,10 +56,6 @@
               "column": 19
             }
           },
-          "range": [
-            7,
-            19
-          ],
           "declarations": [
             {
               "type": "VariableDeclarator",
@@ -87,10 +71,6 @@
                   "column": 19
                 }
               },
-              "range": [
-                11,
-                19
-              ],
               "id": {
                 "type": "Identifier",
                 "start": 11,
@@ -105,10 +85,6 @@
                     "column": 19
                   }
                 },
-                "range": [
-                  11,
-                  19
-                ],
                 "name": "document"
               },
               "init": null
@@ -120,5 +96,6 @@
         "source": null
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/75/expected.json b/test/fixtures/harmony/uncategorised/75/expected.json
index a5dc64c354..fe06e4b03e 100644
--- a/test/fixtures/harmony/uncategorised/75/expected.json
+++ b/test/fixtures/harmony/uncategorised/75/expected.json
@@ -12,10 +12,6 @@
       "column": 25
     }
   },
-  "range": [
-    0,
-    25
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 25
       }
     },
-    "range": [
-      0,
-      25
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 25
           }
         },
-        "range": [
-          0,
-          25
-        ],
         "declaration": {
           "type": "VariableDeclaration",
           "start": 7,
@@ -68,10 +56,6 @@
               "column": 25
             }
           },
-          "range": [
-            7,
-            25
-          ],
           "declarations": [
             {
               "type": "VariableDeclarator",
@@ -87,10 +71,6 @@
                   "column": 25
                 }
               },
-              "range": [
-                11,
-                25
-              ],
               "id": {
                 "type": "Identifier",
                 "start": 11,
@@ -105,10 +85,6 @@
                     "column": 19
                   }
                 },
-                "range": [
-                  11,
-                  19
-                ],
                 "name": "document"
               },
               "init": {
@@ -125,10 +101,6 @@
                     "column": 25
                   }
                 },
-                "range": [
-                  22,
-                  25
-                ],
                 "properties": []
               }
             }
@@ -139,5 +111,6 @@
         "source": null
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/76/expected.json b/test/fixtures/harmony/uncategorised/76/expected.json
index fa85f190d6..ff09e9c318 100644
--- a/test/fixtures/harmony/uncategorised/76/expected.json
+++ b/test/fixtures/harmony/uncategorised/76/expected.json
@@ -12,10 +12,6 @@
       "column": 27
     }
   },
-  "range": [
-    0,
-    27
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 27
       }
     },
-    "range": [
-      0,
-      27
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 27
           }
         },
-        "range": [
-          0,
-          27
-        ],
         "declaration": {
           "type": "VariableDeclaration",
           "start": 7,
@@ -68,10 +56,6 @@
               "column": 27
             }
           },
-          "range": [
-            7,
-            27
-          ],
           "declarations": [
             {
               "type": "VariableDeclarator",
@@ -87,10 +71,6 @@
                   "column": 27
                 }
               },
-              "range": [
-                13,
-                27
-              ],
               "id": {
                 "type": "Identifier",
                 "start": 13,
@@ -105,10 +85,6 @@
                     "column": 21
                   }
                 },
-                "range": [
-                  13,
-                  21
-                ],
                 "name": "document"
               },
               "init": {
@@ -125,10 +101,6 @@
                     "column": 27
                   }
                 },
-                "range": [
-                  24,
-                  27
-                ],
                 "properties": []
               }
             }
@@ -139,5 +111,6 @@
         "source": null
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/77/expected.json b/test/fixtures/harmony/uncategorised/77/expected.json
index 08ead5dfb6..9eada77464 100644
--- a/test/fixtures/harmony/uncategorised/77/expected.json
+++ b/test/fixtures/harmony/uncategorised/77/expected.json
@@ -12,10 +12,6 @@
       "column": 27
     }
   },
-  "range": [
-    0,
-    27
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 27
       }
     },
-    "range": [
-      0,
-      27
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 27
           }
         },
-        "range": [
-          0,
-          27
-        ],
         "declaration": {
           "type": "FunctionDeclaration",
           "start": 7,
@@ -68,10 +56,6 @@
               "column": 27
             }
           },
-          "range": [
-            7,
-            27
-          ],
           "id": {
             "type": "Identifier",
             "start": 16,
@@ -86,10 +70,6 @@
                 "column": 21
               }
             },
-            "range": [
-              16,
-              21
-            ],
             "name": "parse"
           },
           "generator": false,
@@ -109,10 +89,6 @@
                 "column": 27
               }
             },
-            "range": [
-              24,
-              27
-            ],
             "body": []
           }
         },
@@ -120,5 +96,6 @@
         "source": null
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/78/expected.json b/test/fixtures/harmony/uncategorised/78/expected.json
index d7ccae912d..013eb146ba 100644
--- a/test/fixtures/harmony/uncategorised/78/expected.json
+++ b/test/fixtures/harmony/uncategorised/78/expected.json
@@ -12,10 +12,6 @@
       "column": 21
     }
   },
-  "range": [
-    0,
-    21
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 21
       }
     },
-    "range": [
-      0,
-      21
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 21
           }
         },
-        "range": [
-          0,
-          21
-        ],
         "declaration": {
           "type": "ClassDeclaration",
           "start": 7,
@@ -68,10 +56,6 @@
               "column": 21
             }
           },
-          "range": [
-            7,
-            21
-          ],
           "id": {
             "type": "Identifier",
             "start": 13,
@@ -86,10 +70,6 @@
                 "column": 18
               }
             },
-            "range": [
-              13,
-              18
-            ],
             "name": "Class"
           },
           "superClass": null,
@@ -107,10 +87,6 @@
                 "column": 21
               }
             },
-            "range": [
-              19,
-              21
-            ],
             "body": []
           }
         },
@@ -118,5 +94,6 @@
         "source": null
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/79/expected.json b/test/fixtures/harmony/uncategorised/79/expected.json
index 17d0e7875c..5fcf2bac2b 100644
--- a/test/fixtures/harmony/uncategorised/79/expected.json
+++ b/test/fixtures/harmony/uncategorised/79/expected.json
@@ -12,10 +12,6 @@
       "column": 17
     }
   },
-  "range": [
-    0,
-    17
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 17
       }
     },
-    "range": [
-      0,
-      17
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 17
           }
         },
-        "range": [
-          0,
-          17
-        ],
         "declaration": {
           "type": "Literal",
           "start": 15,
@@ -68,15 +56,12 @@
               "column": 17
             }
           },
-          "range": [
-            15,
-            17
-          ],
           "value": 42,
           "rawValue": 42,
           "raw": "42"
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/8/expected.json b/test/fixtures/harmony/uncategorised/8/expected.json
index 13c0f9b64c..1f7b741877 100644
--- a/test/fixtures/harmony/uncategorised/8/expected.json
+++ b/test/fixtures/harmony/uncategorised/8/expected.json
@@ -12,10 +12,6 @@
       "column": 3
     }
   },
-  "range": [
-    0,
-    3
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 3
       }
     },
-    "range": [
-      0,
-      3
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 3
           }
         },
-        "range": [
-          0,
-          3
-        ],
         "expression": {
           "type": "Literal",
           "start": 0,
@@ -68,15 +56,12 @@
               "column": 3
             }
           },
-          "range": [
-            0,
-            3
-          ],
           "value": 0,
           "rawValue": 0,
           "raw": "0O0"
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/80/expected.json b/test/fixtures/harmony/uncategorised/80/expected.json
index 94f712c781..7b2bcc83bd 100644
--- a/test/fixtures/harmony/uncategorised/80/expected.json
+++ b/test/fixtures/harmony/uncategorised/80/expected.json
@@ -12,10 +12,6 @@
       "column": 29
     }
   },
-  "range": [
-    0,
-    29
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 29
       }
     },
-    "range": [
-      0,
-      29
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 29
           }
         },
-        "range": [
-          0,
-          29
-        ],
         "declaration": {
           "type": "FunctionExpression",
           "start": 15,
@@ -68,10 +56,6 @@
               "column": 29
             }
           },
-          "range": [
-            15,
-            29
-          ],
           "id": null,
           "generator": false,
           "expression": false,
@@ -90,14 +74,11 @@
                 "column": 29
               }
             },
-            "range": [
-              27,
-              29
-            ],
             "body": []
           }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/81/expected.json b/test/fixtures/harmony/uncategorised/81/expected.json
index f353245d66..2bcb3a0d57 100644
--- a/test/fixtures/harmony/uncategorised/81/expected.json
+++ b/test/fixtures/harmony/uncategorised/81/expected.json
@@ -12,10 +12,6 @@
       "column": 30
     }
   },
-  "range": [
-    0,
-    30
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 30
       }
     },
-    "range": [
-      0,
-      30
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 30
           }
         },
-        "range": [
-          0,
-          30
-        ],
         "declaration": {
           "type": "FunctionDeclaration",
           "start": 15,
@@ -68,10 +56,6 @@
               "column": 30
             }
           },
-          "range": [
-            15,
-            30
-          ],
           "id": {
             "type": "Identifier",
             "start": 24,
@@ -86,10 +70,6 @@
                 "column": 25
               }
             },
-            "range": [
-              24,
-              25
-            ],
             "name": "f"
           },
           "generator": false,
@@ -109,14 +89,11 @@
                 "column": 30
               }
             },
-            "range": [
-              28,
-              30
-            ],
             "body": []
           }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/82/expected.json b/test/fixtures/harmony/uncategorised/82/expected.json
index 8d916c0821..f0b1e778eb 100644
--- a/test/fixtures/harmony/uncategorised/82/expected.json
+++ b/test/fixtures/harmony/uncategorised/82/expected.json
@@ -12,10 +12,6 @@
       "column": 23
     }
   },
-  "range": [
-    0,
-    23
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 23
       }
     },
-    "range": [
-      0,
-      23
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 23
           }
         },
-        "range": [
-          0,
-          23
-        ],
         "declaration": {
           "type": "ClassExpression",
           "start": 15,
@@ -68,10 +56,6 @@
               "column": 23
             }
           },
-          "range": [
-            15,
-            23
-          ],
           "id": null,
           "superClass": null,
           "body": {
@@ -88,14 +72,11 @@
                 "column": 23
               }
             },
-            "range": [
-              21,
-              23
-            ],
             "body": []
           }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/83/expected.json b/test/fixtures/harmony/uncategorised/83/expected.json
index 294ef4841d..fe765d760c 100644
--- a/test/fixtures/harmony/uncategorised/83/expected.json
+++ b/test/fixtures/harmony/uncategorised/83/expected.json
@@ -12,10 +12,6 @@
       "column": 25
     }
   },
-  "range": [
-    0,
-    25
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 25
       }
     },
-    "range": [
-      0,
-      25
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 25
           }
         },
-        "range": [
-          0,
-          25
-        ],
         "declaration": {
           "type": "ClassDeclaration",
           "start": 15,
@@ -68,10 +56,6 @@
               "column": 25
             }
           },
-          "range": [
-            15,
-            25
-          ],
           "id": {
             "type": "Identifier",
             "start": 21,
@@ -86,10 +70,6 @@
                 "column": 22
               }
             },
-            "range": [
-              21,
-              22
-            ],
             "name": "A"
           },
           "superClass": null,
@@ -107,14 +87,11 @@
                 "column": 25
               }
             },
-            "range": [
-              23,
-              25
-            ],
             "body": []
           }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/85/expected.json b/test/fixtures/harmony/uncategorised/85/expected.json
index ab4cf68452..0650eea051 100644
--- a/test/fixtures/harmony/uncategorised/85/expected.json
+++ b/test/fixtures/harmony/uncategorised/85/expected.json
@@ -12,10 +12,6 @@
       "column": 22
     }
   },
-  "range": [
-    0,
-    22
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 22
       }
     },
-    "range": [
-      0,
-      22
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 22
           }
         },
-        "range": [
-          0,
-          22
-        ],
         "source": {
           "type": "Literal",
           "start": 14,
@@ -68,15 +56,12 @@
               "column": 22
             }
           },
-          "range": [
-            14,
-            22
-          ],
           "value": "crypto",
           "rawValue": "crypto",
           "raw": "\"crypto\""
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/86/expected.json b/test/fixtures/harmony/uncategorised/86/expected.json
index 94a6d70a3f..ae2d126022 100644
--- a/test/fixtures/harmony/uncategorised/86/expected.json
+++ b/test/fixtures/harmony/uncategorised/86/expected.json
@@ -12,10 +12,6 @@
       "column": 18
     }
   },
-  "range": [
-    0,
-    18
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 18
       }
     },
-    "range": [
-      0,
-      18
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 18
           }
         },
-        "range": [
-          0,
-          18
-        ],
         "declaration": null,
         "specifiers": [
           {
@@ -70,10 +58,6 @@
                 "column": 16
               }
             },
-            "range": [
-              9,
-              16
-            ],
             "local": {
               "type": "Identifier",
               "start": 9,
@@ -88,10 +72,6 @@
                   "column": 16
                 }
               },
-              "range": [
-                9,
-                16
-              ],
               "name": "encrypt"
             },
             "exported": {
@@ -108,10 +88,6 @@
                   "column": 16
                 }
               },
-              "range": [
-                9,
-                16
-              ],
               "name": "encrypt"
             }
           }
@@ -119,5 +95,6 @@
         "source": null
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/87/expected.json b/test/fixtures/harmony/uncategorised/87/expected.json
index de54e8aee6..7b44c44875 100644
--- a/test/fixtures/harmony/uncategorised/87/expected.json
+++ b/test/fixtures/harmony/uncategorised/87/expected.json
@@ -12,10 +12,6 @@
       "column": 27
     }
   },
-  "range": [
-    0,
-    27
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 27
       }
     },
-    "range": [
-      0,
-      27
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 27
           }
         },
-        "range": [
-          0,
-          27
-        ],
         "declaration": null,
         "specifiers": [
           {
@@ -70,10 +58,6 @@
                 "column": 16
               }
             },
-            "range": [
-              9,
-              16
-            ],
             "local": {
               "type": "Identifier",
               "start": 9,
@@ -88,10 +72,6 @@
                   "column": 16
                 }
               },
-              "range": [
-                9,
-                16
-              ],
               "name": "encrypt"
             },
             "exported": {
@@ -108,10 +88,6 @@
                   "column": 16
                 }
               },
-              "range": [
-                9,
-                16
-              ],
               "name": "encrypt"
             }
           },
@@ -129,10 +105,6 @@
                 "column": 25
               }
             },
-            "range": [
-              18,
-              25
-            ],
             "local": {
               "type": "Identifier",
               "start": 18,
@@ -147,10 +119,6 @@
                   "column": 25
                 }
               },
-              "range": [
-                18,
-                25
-              ],
               "name": "decrypt"
             },
             "exported": {
@@ -167,10 +135,6 @@
                   "column": 25
                 }
               },
-              "range": [
-                18,
-                25
-              ],
               "name": "decrypt"
             }
           }
@@ -178,5 +142,6 @@
         "source": null
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/88/expected.json b/test/fixtures/harmony/uncategorised/88/expected.json
index e3b884a1b1..afbd89b3af 100644
--- a/test/fixtures/harmony/uncategorised/88/expected.json
+++ b/test/fixtures/harmony/uncategorised/88/expected.json
@@ -12,10 +12,6 @@
       "column": 29
     }
   },
-  "range": [
-    0,
-    29
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 29
       }
     },
-    "range": [
-      0,
-      29
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 29
           }
         },
-        "range": [
-          0,
-          29
-        ],
         "declaration": null,
         "specifiers": [
           {
@@ -70,10 +58,6 @@
                 "column": 27
               }
             },
-            "range": [
-              9,
-              27
-            ],
             "local": {
               "type": "Identifier",
               "start": 9,
@@ -88,10 +72,6 @@
                   "column": 16
                 }
               },
-              "range": [
-                9,
-                16
-              ],
               "name": "encrypt"
             },
             "exported": {
@@ -108,10 +88,6 @@
                   "column": 27
                 }
               },
-              "range": [
-                20,
-                27
-              ],
               "name": "default"
             }
           }
@@ -119,5 +95,6 @@
         "source": null
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/89/expected.json b/test/fixtures/harmony/uncategorised/89/expected.json
index 0fa564d7e3..a0329fee1e 100644
--- a/test/fixtures/harmony/uncategorised/89/expected.json
+++ b/test/fixtures/harmony/uncategorised/89/expected.json
@@ -12,10 +12,6 @@
       "column": 34
     }
   },
-  "range": [
-    0,
-    34
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 34
       }
     },
-    "range": [
-      0,
-      34
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 34
           }
         },
-        "range": [
-          0,
-          34
-        ],
         "declaration": null,
         "specifiers": [
           {
@@ -70,10 +58,6 @@
                 "column": 16
               }
             },
-            "range": [
-              9,
-              16
-            ],
             "local": {
               "type": "Identifier",
               "start": 9,
@@ -88,10 +72,6 @@
                   "column": 16
                 }
               },
-              "range": [
-                9,
-                16
-              ],
               "name": "encrypt"
             },
             "exported": {
@@ -108,10 +88,6 @@
                   "column": 16
                 }
               },
-              "range": [
-                9,
-                16
-              ],
               "name": "encrypt"
             }
           },
@@ -129,10 +105,6 @@
                 "column": 32
               }
             },
-            "range": [
-              18,
-              32
-            ],
             "local": {
               "type": "Identifier",
               "start": 18,
@@ -147,10 +119,6 @@
                   "column": 25
                 }
               },
-              "range": [
-                18,
-                25
-              ],
               "name": "decrypt"
             },
             "exported": {
@@ -167,10 +135,6 @@
                   "column": 32
                 }
               },
-              "range": [
-                29,
-                32
-              ],
               "name": "dec"
             }
           }
@@ -178,5 +142,6 @@
         "source": null
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/9/expected.json b/test/fixtures/harmony/uncategorised/9/expected.json
index 08e0fb85df..cfb1516d82 100644
--- a/test/fixtures/harmony/uncategorised/9/expected.json
+++ b/test/fixtures/harmony/uncategorised/9/expected.json
@@ -12,10 +12,6 @@
       "column": 37
     }
   },
-  "range": [
-    0,
-    37
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 37
       }
     },
-    "range": [
-      0,
-      37
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 37
           }
         },
-        "range": [
-          0,
-          37
-        ],
         "id": {
           "type": "Identifier",
           "start": 9,
@@ -68,10 +56,6 @@
               "column": 13
             }
           },
-          "range": [
-            9,
-            13
-          ],
           "name": "test"
         },
         "generator": false,
@@ -91,10 +75,6 @@
               "column": 37
             }
           },
-          "range": [
-            16,
-            37
-          ],
           "body": [
             {
               "type": "ExpressionStatement",
@@ -110,10 +90,6 @@
                   "column": 30
                 }
               },
-              "range": [
-                17,
-                30
-              ],
               "expression": {
                 "type": "Literal",
                 "start": 17,
@@ -128,10 +104,6 @@
                     "column": 29
                   }
                 },
-                "range": [
-                  17,
-                  29
-                ],
                 "value": "use strict",
                 "rawValue": "use strict",
                 "raw": "'use strict'"
@@ -151,10 +123,6 @@
                   "column": 35
                 }
               },
-              "range": [
-                31,
-                35
-              ],
               "expression": {
                 "type": "Literal",
                 "start": 31,
@@ -169,10 +137,6 @@
                     "column": 34
                   }
                 },
-                "range": [
-                  31,
-                  34
-                ],
                 "value": 0,
                 "rawValue": 0,
                 "raw": "0O0"
@@ -182,5 +146,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/90/expected.json b/test/fixtures/harmony/uncategorised/90/expected.json
index e610050078..49b363d4b6 100644
--- a/test/fixtures/harmony/uncategorised/90/expected.json
+++ b/test/fixtures/harmony/uncategorised/90/expected.json
@@ -12,10 +12,6 @@
       "column": 31
     }
   },
-  "range": [
-    0,
-    31
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 31
       }
     },
-    "range": [
-      0,
-      31
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 31
           }
         },
-        "range": [
-          0,
-          31
-        ],
         "declaration": null,
         "specifiers": [
           {
@@ -70,10 +58,6 @@
                 "column": 16
               }
             },
-            "range": [
-              9,
-              16
-            ],
             "local": {
               "type": "Identifier",
               "start": 9,
@@ -88,10 +72,6 @@
                   "column": 16
                 }
               },
-              "range": [
-                9,
-                16
-              ],
               "name": "default"
             },
             "exported": {
@@ -108,10 +88,6 @@
                   "column": 16
                 }
               },
-              "range": [
-                9,
-                16
-              ],
               "name": "default"
             }
           }
@@ -130,15 +106,12 @@
               "column": 31
             }
           },
-          "range": [
-            24,
-            31
-          ],
           "value": "other",
           "rawValue": "other",
           "raw": "\"other\""
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/91/expected.json b/test/fixtures/harmony/uncategorised/91/expected.json
index dcd070bc87..2f38963800 100644
--- a/test/fixtures/harmony/uncategorised/91/expected.json
+++ b/test/fixtures/harmony/uncategorised/91/expected.json
@@ -12,10 +12,6 @@
       "column": 15
     }
   },
-  "range": [
-    0,
-    15
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 15
       }
     },
-    "range": [
-      0,
-      15
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 15
           }
         },
-        "range": [
-          0,
-          15
-        ],
         "specifiers": [],
         "source": {
           "type": "Literal",
@@ -69,15 +57,12 @@
               "column": 15
             }
           },
-          "range": [
-            7,
-            15
-          ],
           "value": "jquery",
           "rawValue": "jquery",
           "raw": "\"jquery\""
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/92/expected.json b/test/fixtures/harmony/uncategorised/92/expected.json
index fb2f970fc3..4682d05c0c 100644
--- a/test/fixtures/harmony/uncategorised/92/expected.json
+++ b/test/fixtures/harmony/uncategorised/92/expected.json
@@ -12,10 +12,6 @@
       "column": 22
     }
   },
-  "range": [
-    0,
-    22
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 22
       }
     },
-    "range": [
-      0,
-      22
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 22
           }
         },
-        "range": [
-          0,
-          22
-        ],
         "specifiers": [
           {
             "type": "ImportDefaultSpecifier",
@@ -69,10 +57,6 @@
                 "column": 8
               }
             },
-            "range": [
-              7,
-              8
-            ],
             "local": {
               "type": "Identifier",
               "start": 7,
@@ -87,10 +71,6 @@
                   "column": 8
                 }
               },
-              "range": [
-                7,
-                8
-              ],
               "name": "$"
             }
           }
@@ -109,15 +89,12 @@
               "column": 22
             }
           },
-          "range": [
-            14,
-            22
-          ],
           "value": "jquery",
           "rawValue": "jquery",
           "raw": "\"jquery\""
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/93/expected.json b/test/fixtures/harmony/uncategorised/93/expected.json
index 64fc49f073..082b8631eb 100644
--- a/test/fixtures/harmony/uncategorised/93/expected.json
+++ b/test/fixtures/harmony/uncategorised/93/expected.json
@@ -12,10 +12,6 @@
       "column": 41
     }
   },
-  "range": [
-    0,
-    41
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 41
       }
     },
-    "range": [
-      0,
-      41
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 41
           }
         },
-        "range": [
-          0,
-          41
-        ],
         "specifiers": [
           {
             "type": "ImportSpecifier",
@@ -69,10 +57,6 @@
                 "column": 16
               }
             },
-            "range": [
-              9,
-              16
-            ],
             "imported": {
               "type": "Identifier",
               "start": 9,
@@ -87,10 +71,6 @@
                   "column": 16
                 }
               },
-              "range": [
-                9,
-                16
-              ],
               "name": "encrypt"
             },
             "local": {
@@ -107,10 +87,6 @@
                   "column": 16
                 }
               },
-              "range": [
-                9,
-                16
-              ],
               "name": "encrypt"
             }
           },
@@ -128,10 +104,6 @@
                 "column": 25
               }
             },
-            "range": [
-              18,
-              25
-            ],
             "imported": {
               "type": "Identifier",
               "start": 18,
@@ -146,10 +118,6 @@
                   "column": 25
                 }
               },
-              "range": [
-                18,
-                25
-              ],
               "name": "decrypt"
             },
             "local": {
@@ -166,10 +134,6 @@
                   "column": 25
                 }
               },
-              "range": [
-                18,
-                25
-              ],
               "name": "decrypt"
             }
           }
@@ -188,15 +152,12 @@
               "column": 41
             }
           },
-          "range": [
-            33,
-            41
-          ],
           "value": "crypto",
           "rawValue": "crypto",
           "raw": "\"crypto\""
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/94/expected.json b/test/fixtures/harmony/uncategorised/94/expected.json
index d138ea595f..00a9ffa137 100644
--- a/test/fixtures/harmony/uncategorised/94/expected.json
+++ b/test/fixtures/harmony/uncategorised/94/expected.json
@@ -12,10 +12,6 @@
       "column": 39
     }
   },
-  "range": [
-    0,
-    39
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 39
       }
     },
-    "range": [
-      0,
-      39
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 39
           }
         },
-        "range": [
-          0,
-          39
-        ],
         "specifiers": [
           {
             "type": "ImportSpecifier",
@@ -69,10 +57,6 @@
                 "column": 23
               }
             },
-            "range": [
-              9,
-              23
-            ],
             "imported": {
               "type": "Identifier",
               "start": 9,
@@ -87,10 +71,6 @@
                   "column": 16
                 }
               },
-              "range": [
-                9,
-                16
-              ],
               "name": "encrypt"
             },
             "local": {
@@ -107,10 +87,6 @@
                   "column": 23
                 }
               },
-              "range": [
-                20,
-                23
-              ],
               "name": "enc"
             }
           }
@@ -129,15 +105,12 @@
               "column": 39
             }
           },
-          "range": [
-            31,
-            39
-          ],
           "value": "crypto",
           "rawValue": "crypto",
           "raw": "\"crypto\""
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/95/expected.json b/test/fixtures/harmony/uncategorised/95/expected.json
index 1d3bde55e3..0d5c48622d 100644
--- a/test/fixtures/harmony/uncategorised/95/expected.json
+++ b/test/fixtures/harmony/uncategorised/95/expected.json
@@ -12,10 +12,6 @@
       "column": 56
     }
   },
-  "range": [
-    0,
-    56
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 56
       }
     },
-    "range": [
-      0,
-      56
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 56
           }
         },
-        "range": [
-          0,
-          56
-        ],
         "specifiers": [
           {
             "type": "ImportDefaultSpecifier",
@@ -69,10 +57,6 @@
                 "column": 13
               }
             },
-            "range": [
-              7,
-              13
-            ],
             "local": {
               "type": "Identifier",
               "start": 7,
@@ -87,10 +71,6 @@
                   "column": 13
                 }
               },
-              "range": [
-                7,
-                13
-              ],
               "name": "crypto"
             }
           },
@@ -108,10 +88,6 @@
                 "column": 24
               }
             },
-            "range": [
-              17,
-              24
-            ],
             "imported": {
               "type": "Identifier",
               "start": 17,
@@ -126,10 +102,6 @@
                   "column": 24
                 }
               },
-              "range": [
-                17,
-                24
-              ],
               "name": "decrypt"
             },
             "local": {
@@ -146,10 +118,6 @@
                   "column": 24
                 }
               },
-              "range": [
-                17,
-                24
-              ],
               "name": "decrypt"
             }
           },
@@ -167,10 +135,6 @@
                 "column": 40
               }
             },
-            "range": [
-              26,
-              40
-            ],
             "imported": {
               "type": "Identifier",
               "start": 26,
@@ -185,10 +149,6 @@
                   "column": 33
                 }
               },
-              "range": [
-                26,
-                33
-              ],
               "name": "encrypt"
             },
             "local": {
@@ -205,10 +165,6 @@
                   "column": 40
                 }
               },
-              "range": [
-                37,
-                40
-              ],
               "name": "enc"
             }
           }
@@ -227,15 +183,12 @@
               "column": 56
             }
           },
-          "range": [
-            48,
-            56
-          ],
           "value": "crypto",
           "rawValue": "crypto",
           "raw": "\"crypto\""
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/97/expected.json b/test/fixtures/harmony/uncategorised/97/expected.json
index 41b4cd8db8..d5bc7664d0 100644
--- a/test/fixtures/harmony/uncategorised/97/expected.json
+++ b/test/fixtures/harmony/uncategorised/97/expected.json
@@ -12,10 +12,6 @@
       "column": 33
     }
   },
-  "range": [
-    0,
-    33
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 33
       }
     },
-    "range": [
-      0,
-      33
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 33
           }
         },
-        "range": [
-          0,
-          33
-        ],
         "specifiers": [
           {
             "type": "ImportSpecifier",
@@ -69,10 +57,6 @@
                 "column": 20
               }
             },
-            "range": [
-              9,
-              20
-            ],
             "imported": {
               "type": "Identifier",
               "start": 9,
@@ -87,10 +71,6 @@
                   "column": 13
                 }
               },
-              "range": [
-                9,
-                13
-              ],
               "name": "null"
             },
             "local": {
@@ -107,10 +87,6 @@
                   "column": 20
                 }
               },
-              "range": [
-                17,
-                20
-              ],
               "name": "nil"
             }
           }
@@ -129,15 +105,12 @@
               "column": 33
             }
           },
-          "range": [
-            28,
-            33
-          ],
           "value": "bar",
           "rawValue": "bar",
           "raw": "\"bar\""
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/98/expected.json b/test/fixtures/harmony/uncategorised/98/expected.json
index 3699f973b8..1687774468 100644
--- a/test/fixtures/harmony/uncategorised/98/expected.json
+++ b/test/fixtures/harmony/uncategorised/98/expected.json
@@ -12,10 +12,6 @@
       "column": 32
     }
   },
-  "range": [
-    0,
-    32
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 32
       }
     },
-    "range": [
-      0,
-      32
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 32
           }
         },
-        "range": [
-          0,
-          32
-        ],
         "specifiers": [
           {
             "type": "ImportNamespaceSpecifier",
@@ -69,10 +57,6 @@
                 "column": 18
               }
             },
-            "range": [
-              7,
-              18
-            ],
             "local": {
               "type": "Identifier",
               "start": 12,
@@ -87,10 +71,6 @@
                   "column": 18
                 }
               },
-              "range": [
-                12,
-                18
-              ],
               "name": "crypto"
             }
           }
@@ -109,15 +89,12 @@
               "column": 32
             }
           },
-          "range": [
-            24,
-            32
-          ],
           "value": "crypto",
           "rawValue": "crypto",
           "raw": "\"crypto\""
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/harmony/uncategorised/99/expected.json b/test/fixtures/harmony/uncategorised/99/expected.json
index 8782aac7a5..5732c1085e 100644
--- a/test/fixtures/harmony/uncategorised/99/expected.json
+++ b/test/fixtures/harmony/uncategorised/99/expected.json
@@ -12,10 +12,6 @@
       "column": 26
     }
   },
-  "range": [
-    0,
-    26
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 26
       }
     },
-    "range": [
-      0,
-      26
-    ],
     "sourceType": "module",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 26
           }
         },
-        "range": [
-          0,
-          26
-        ],
         "expression": {
           "type": "FunctionExpression",
           "start": 1,
@@ -68,10 +56,6 @@
               "column": 25
             }
           },
-          "range": [
-            1,
-            25
-          ],
           "id": null,
           "generator": true,
           "expression": false,
@@ -90,10 +74,6 @@
                 "column": 25
               }
             },
-            "range": [
-              14,
-              25
-            ],
             "body": [
               {
                 "type": "ExpressionStatement",
@@ -109,10 +89,6 @@
                     "column": 23
                   }
                 },
-                "range": [
-                  16,
-                  23
-                ],
                 "expression": {
                   "type": "YieldExpression",
                   "start": 16,
@@ -127,10 +103,6 @@
                       "column": 23
                     }
                   },
-                  "range": [
-                    16,
-                    23
-                  ],
                   "delegate": false,
                   "argument": {
                     "type": "Identifier",
@@ -146,10 +118,6 @@
                         "column": 23
                       }
                     },
-                    "range": [
-                      22,
-                      23
-                    ],
                     "name": "v"
                   }
                 }
@@ -160,5 +128,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/jsx/basic/1/expected.json b/test/fixtures/jsx/basic/1/expected.json
index 3a2193a81c..cc297bc62f 100644
--- a/test/fixtures/jsx/basic/1/expected.json
+++ b/test/fixtures/jsx/basic/1/expected.json
@@ -12,10 +12,6 @@
       "column": 5
     }
   },
-  "range": [
-    0,
-    5
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 5
       }
     },
-    "range": [
-      0,
-      5
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 5
           }
         },
-        "range": [
-          0,
-          5
-        ],
         "expression": {
           "type": "JSXElement",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 5
             }
           },
-          "range": [
-            0,
-            5
-          ],
           "openingElement": {
             "type": "JSXOpeningElement",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 5
               }
             },
-            "range": [
-              0,
-              5
-            ],
             "attributes": [],
             "name": {
               "type": "JSXIdentifier",
@@ -105,10 +85,6 @@
                   "column": 2
                 }
               },
-              "range": [
-                1,
-                2
-              ],
               "name": "a"
             },
             "selfClosing": true
@@ -118,5 +94,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/jsx/basic/10/expected.json b/test/fixtures/jsx/basic/10/expected.json
index 98f937273f..b8b912613e 100644
--- a/test/fixtures/jsx/basic/10/expected.json
+++ b/test/fixtures/jsx/basic/10/expected.json
@@ -12,10 +12,6 @@
       "column": 32
     }
   },
-  "range": [
-    0,
-    32
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 32
       }
     },
-    "range": [
-      0,
-      32
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 32
           }
         },
-        "range": [
-          0,
-          32
-        ],
         "expression": {
           "type": "JSXElement",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 32
             }
           },
-          "range": [
-            0,
-            32
-          ],
           "openingElement": {
             "type": "JSXOpeningElement",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 3
               }
             },
-            "range": [
-              0,
-              3
-            ],
             "attributes": [],
             "name": {
               "type": "JSXIdentifier",
@@ -105,10 +85,6 @@
                   "column": 2
                 }
               },
-              "range": [
-                1,
-                2
-              ],
               "name": "a"
             },
             "selfClosing": false
@@ -127,10 +103,6 @@
                 "column": 32
               }
             },
-            "range": [
-              28,
-              32
-            ],
             "name": {
               "type": "JSXIdentifier",
               "start": 30,
@@ -145,10 +117,6 @@
                   "column": 31
                 }
               },
-              "range": [
-                30,
-                31
-              ],
               "name": "a",
               "leadingComments": null
             },
@@ -190,10 +158,6 @@
                   "column": 28
                 }
               },
-              "range": [
-                3,
-                28
-              ],
               "expression": {
                 "type": "JSXEmptyExpression",
                 "start": 4,
@@ -208,10 +172,6 @@
                     "column": 27
                   }
                 },
-                "range": [
-                  4,
-                  27
-                ],
                 "leadingComments": null,
                 "innerComments": [
                   {
@@ -241,5 +201,27 @@
         }
       }
     ]
-  }
+  },
+  "comments": [
+    {
+      "type": "CommentBlock",
+      "value": " this is a comment ",
+      "start": 4,
+      "end": 27,
+      "loc": {
+        "start": {
+          "line": 1,
+          "column": 4
+        },
+        "end": {
+          "line": 1,
+          "column": 27
+        }
+      },
+      "range": [
+        4,
+        27
+      ]
+    }
+  ]
 }
\ No newline at end of file
diff --git a/test/fixtures/jsx/basic/11/expected.json b/test/fixtures/jsx/basic/11/expected.json
index 0bac0d881d..6f0e2cd475 100644
--- a/test/fixtures/jsx/basic/11/expected.json
+++ b/test/fixtures/jsx/basic/11/expected.json
@@ -12,10 +12,6 @@
       "column": 24
     }
   },
-  "range": [
-    0,
-    24
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 24
       }
     },
-    "range": [
-      0,
-      24
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 24
           }
         },
-        "range": [
-          0,
-          24
-        ],
         "expression": {
           "type": "JSXElement",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 24
             }
           },
-          "range": [
-            0,
-            24
-          ],
           "openingElement": {
             "type": "JSXOpeningElement",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 5
               }
             },
-            "range": [
-              0,
-              5
-            ],
             "attributes": [],
             "name": {
               "type": "JSXIdentifier",
@@ -105,10 +85,6 @@
                   "column": 4
                 }
               },
-              "range": [
-                1,
-                4
-              ],
               "name": "div"
             },
             "selfClosing": false
@@ -127,10 +103,6 @@
                 "column": 24
               }
             },
-            "range": [
-              18,
-              24
-            ],
             "name": {
               "type": "JSXIdentifier",
               "start": 20,
@@ -145,10 +117,6 @@
                   "column": 23
                 }
               },
-              "range": [
-                20,
-                23
-              ],
               "name": "div"
             }
           },
@@ -167,10 +135,6 @@
                   "column": 18
                 }
               },
-              "range": [
-                5,
-                18
-              ],
               "value": "@test content",
               "rawValue": "@test content",
               "raw": "@test content"
@@ -179,5 +143,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/jsx/basic/12/expected.json b/test/fixtures/jsx/basic/12/expected.json
index 2b4fa9e4e5..f8e15a3fa4 100644
--- a/test/fixtures/jsx/basic/12/expected.json
+++ b/test/fixtures/jsx/basic/12/expected.json
@@ -12,10 +12,6 @@
       "column": 41
     }
   },
-  "range": [
-    0,
-    41
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 41
       }
     },
-    "range": [
-      0,
-      41
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 41
           }
         },
-        "range": [
-          0,
-          41
-        ],
         "expression": {
           "type": "JSXElement",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 41
             }
           },
-          "range": [
-            0,
-            41
-          ],
           "openingElement": {
             "type": "JSXOpeningElement",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 5
               }
             },
-            "range": [
-              0,
-              5
-            ],
             "attributes": [],
             "name": {
               "type": "JSXIdentifier",
@@ -105,10 +85,6 @@
                   "column": 4
                 }
               },
-              "range": [
-                1,
-                4
-              ],
               "name": "div"
             },
             "selfClosing": false
@@ -127,10 +103,6 @@
                 "column": 41
               }
             },
-            "range": [
-              35,
-              41
-            ],
             "name": {
               "type": "JSXIdentifier",
               "start": 37,
@@ -145,10 +117,6 @@
                   "column": 40
                 }
               },
-              "range": [
-                37,
-                40
-              ],
               "name": "div"
             }
           },
@@ -167,10 +135,6 @@
                   "column": 11
                 }
               },
-              "range": [
-                5,
-                11
-              ],
               "openingElement": {
                 "type": "JSXOpeningElement",
                 "start": 5,
@@ -185,10 +149,6 @@
                     "column": 11
                   }
                 },
-                "range": [
-                  5,
-                  11
-                ],
                 "attributes": [],
                 "name": {
                   "type": "JSXIdentifier",
@@ -204,10 +164,6 @@
                       "column": 8
                     }
                   },
-                  "range": [
-                    6,
-                    8
-                  ],
                   "name": "br"
                 },
                 "selfClosing": true
@@ -229,10 +185,6 @@
                   "column": 35
                 }
               },
-              "range": [
-                11,
-                35
-              ],
               "value": "7x invalid-js-identifier",
               "rawValue": "7x invalid-js-identifier",
               "raw": "7x invalid-js-identifier"
@@ -241,5 +193,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/jsx/basic/13/expected.json b/test/fixtures/jsx/basic/13/expected.json
index 82d3b9b378..393f8e7d98 100644
--- a/test/fixtures/jsx/basic/13/expected.json
+++ b/test/fixtures/jsx/basic/13/expected.json
@@ -12,10 +12,6 @@
       "column": 57
     }
   },
-  "range": [
-    0,
-    57
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 57
       }
     },
-    "range": [
-      0,
-      57
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 57
           }
         },
-        "range": [
-          0,
-          57
-        ],
         "expression": {
           "type": "JSXElement",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 57
             }
           },
-          "range": [
-            0,
-            57
-          ],
           "openingElement": {
             "type": "JSXOpeningElement",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 57
               }
             },
-            "range": [
-              0,
-              57
-            ],
             "attributes": [
               {
                 "type": "JSXAttribute",
@@ -105,10 +85,6 @@
                     "column": 21
                   }
                 },
-                "range": [
-                  11,
-                  21
-                ],
                 "name": {
                   "type": "JSXIdentifier",
                   "start": 11,
@@ -123,10 +99,6 @@
                       "column": 15
                     }
                   },
-                  "range": [
-                    11,
-                    15
-                  ],
                   "name": "left"
                 },
                 "value": {
@@ -143,10 +115,6 @@
                       "column": 21
                     }
                   },
-                  "range": [
-                    16,
-                    21
-                  ],
                   "openingElement": {
                     "type": "JSXOpeningElement",
                     "start": 16,
@@ -161,10 +129,6 @@
                         "column": 21
                       }
                     },
-                    "range": [
-                      16,
-                      21
-                    ],
                     "attributes": [],
                     "name": {
                       "type": "JSXIdentifier",
@@ -180,10 +144,6 @@
                           "column": 18
                         }
                       },
-                      "range": [
-                        17,
-                        18
-                      ],
                       "name": "a"
                     },
                     "selfClosing": true
@@ -206,10 +166,6 @@
                     "column": 54
                   }
                 },
-                "range": [
-                  22,
-                  54
-                ],
                 "name": {
                   "type": "JSXIdentifier",
                   "start": 22,
@@ -224,10 +180,6 @@
                       "column": 27
                     }
                   },
-                  "range": [
-                    22,
-                    27
-                  ],
                   "name": "right"
                 },
                 "value": {
@@ -244,10 +196,6 @@
                       "column": 54
                     }
                   },
-                  "range": [
-                    28,
-                    54
-                  ],
                   "openingElement": {
                     "type": "JSXOpeningElement",
                     "start": 28,
@@ -262,10 +210,6 @@
                         "column": 31
                       }
                     },
-                    "range": [
-                      28,
-                      31
-                    ],
                     "attributes": [],
                     "name": {
                       "type": "JSXIdentifier",
@@ -281,10 +225,6 @@
                           "column": 30
                         }
                       },
-                      "range": [
-                        29,
-                        30
-                      ],
                       "name": "b"
                     },
                     "selfClosing": false
@@ -303,10 +243,6 @@
                         "column": 54
                       }
                     },
-                    "range": [
-                      50,
-                      54
-                    ],
                     "name": {
                       "type": "JSXIdentifier",
                       "start": 52,
@@ -321,10 +257,6 @@
                           "column": 53
                         }
                       },
-                      "range": [
-                        52,
-                        53
-                      ],
                       "name": "b"
                     }
                   },
@@ -343,10 +275,6 @@
                           "column": 50
                         }
                       },
-                      "range": [
-                        31,
-                        50
-                      ],
                       "value": "monkeys /> gorillas",
                       "rawValue": "monkeys /> gorillas",
                       "raw": "monkeys /> gorillas"
@@ -369,10 +297,6 @@
                   "column": 10
                 }
               },
-              "range": [
-                1,
-                10
-              ],
               "name": "LeftRight"
             },
             "selfClosing": true
@@ -382,5 +306,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/jsx/basic/14/expected.json b/test/fixtures/jsx/basic/14/expected.json
index b486cc7a56..283763cbac 100644
--- a/test/fixtures/jsx/basic/14/expected.json
+++ b/test/fixtures/jsx/basic/14/expected.json
@@ -12,10 +12,6 @@
       "column": 11
     }
   },
-  "range": [
-    0,
-    11
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 11
       }
     },
-    "range": [
-      0,
-      11
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 11
           }
         },
-        "range": [
-          0,
-          11
-        ],
         "expression": {
           "type": "JSXElement",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 11
             }
           },
-          "range": [
-            0,
-            11
-          ],
           "openingElement": {
             "type": "JSXOpeningElement",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 5
               }
             },
-            "range": [
-              0,
-              5
-            ],
             "attributes": [],
             "name": {
               "type": "JSXMemberExpression",
@@ -105,10 +85,6 @@
                   "column": 4
                 }
               },
-              "range": [
-                1,
-                4
-              ],
               "object": {
                 "type": "JSXIdentifier",
                 "start": 1,
@@ -123,10 +99,6 @@
                     "column": 2
                   }
                 },
-                "range": [
-                  1,
-                  2
-                ],
                 "name": "a"
               },
               "property": {
@@ -143,10 +115,6 @@
                     "column": 4
                   }
                 },
-                "range": [
-                  3,
-                  4
-                ],
                 "name": "b"
               }
             },
@@ -166,10 +134,6 @@
                 "column": 11
               }
             },
-            "range": [
-              5,
-              11
-            ],
             "name": {
               "type": "JSXMemberExpression",
               "start": 7,
@@ -184,10 +148,6 @@
                   "column": 10
                 }
               },
-              "range": [
-                7,
-                10
-              ],
               "object": {
                 "type": "JSXIdentifier",
                 "start": 7,
@@ -202,10 +162,6 @@
                     "column": 8
                   }
                 },
-                "range": [
-                  7,
-                  8
-                ],
                 "name": "a"
               },
               "property": {
@@ -222,10 +178,6 @@
                     "column": 10
                   }
                 },
-                "range": [
-                  9,
-                  10
-                ],
                 "name": "b"
               }
             }
@@ -234,5 +186,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/jsx/basic/15/expected.json b/test/fixtures/jsx/basic/15/expected.json
index a268e9b971..7fc17dcca5 100644
--- a/test/fixtures/jsx/basic/15/expected.json
+++ b/test/fixtures/jsx/basic/15/expected.json
@@ -12,10 +12,6 @@
       "column": 15
     }
   },
-  "range": [
-    0,
-    15
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 15
       }
     },
-    "range": [
-      0,
-      15
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 15
           }
         },
-        "range": [
-          0,
-          15
-        ],
         "expression": {
           "type": "JSXElement",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 15
             }
           },
-          "range": [
-            0,
-            15
-          ],
           "openingElement": {
             "type": "JSXOpeningElement",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 7
               }
             },
-            "range": [
-              0,
-              7
-            ],
             "attributes": [],
             "name": {
               "type": "JSXMemberExpression",
@@ -105,10 +85,6 @@
                   "column": 6
                 }
               },
-              "range": [
-                1,
-                6
-              ],
               "object": {
                 "type": "JSXMemberExpression",
                 "start": 1,
@@ -123,10 +99,6 @@
                     "column": 4
                   }
                 },
-                "range": [
-                  1,
-                  4
-                ],
                 "object": {
                   "type": "JSXIdentifier",
                   "start": 1,
@@ -141,10 +113,6 @@
                       "column": 2
                     }
                   },
-                  "range": [
-                    1,
-                    2
-                  ],
                   "name": "a"
                 },
                 "property": {
@@ -161,10 +129,6 @@
                       "column": 4
                     }
                   },
-                  "range": [
-                    3,
-                    4
-                  ],
                   "name": "b"
                 }
               },
@@ -182,10 +146,6 @@
                     "column": 6
                   }
                 },
-                "range": [
-                  5,
-                  6
-                ],
                 "name": "c"
               }
             },
@@ -205,10 +165,6 @@
                 "column": 15
               }
             },
-            "range": [
-              7,
-              15
-            ],
             "name": {
               "type": "JSXMemberExpression",
               "start": 9,
@@ -223,10 +179,6 @@
                   "column": 14
                 }
               },
-              "range": [
-                9,
-                14
-              ],
               "object": {
                 "type": "JSXMemberExpression",
                 "start": 9,
@@ -241,10 +193,6 @@
                     "column": 12
                   }
                 },
-                "range": [
-                  9,
-                  12
-                ],
                 "object": {
                   "type": "JSXIdentifier",
                   "start": 9,
@@ -259,10 +207,6 @@
                       "column": 10
                     }
                   },
-                  "range": [
-                    9,
-                    10
-                  ],
                   "name": "a"
                 },
                 "property": {
@@ -279,10 +223,6 @@
                       "column": 12
                     }
                   },
-                  "range": [
-                    11,
-                    12
-                  ],
                   "name": "b"
                 }
               },
@@ -300,10 +240,6 @@
                     "column": 14
                   }
                 },
-                "range": [
-                  13,
-                  14
-                ],
                 "name": "c"
               }
             }
@@ -312,5 +248,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/jsx/basic/16/expected.json b/test/fixtures/jsx/basic/16/expected.json
index 45a11ca61c..9e21b2e01a 100644
--- a/test/fixtures/jsx/basic/16/expected.json
+++ b/test/fixtures/jsx/basic/16/expected.json
@@ -12,10 +12,6 @@
       "column": 14
     }
   },
-  "range": [
-    0,
-    14
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 14
       }
     },
-    "range": [
-      0,
-      14
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 14
           }
         },
-        "range": [
-          0,
-          14
-        ],
         "expression": {
           "type": "BinaryExpression",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 13
             }
           },
-          "range": [
-            0,
-            13
-          ],
           "left": {
             "type": "JSXElement",
             "start": 1,
@@ -86,10 +70,6 @@
                 "column": 8
               }
             },
-            "range": [
-              1,
-              8
-            ],
             "openingElement": {
               "type": "JSXOpeningElement",
               "start": 1,
@@ -104,10 +84,6 @@
                   "column": 8
                 }
               },
-              "range": [
-                1,
-                8
-              ],
               "attributes": [],
               "name": {
                 "type": "JSXIdentifier",
@@ -123,10 +99,6 @@
                     "column": 5
                   }
                 },
-                "range": [
-                  2,
-                  5
-                ],
                 "name": "div"
               },
               "selfClosing": true
@@ -150,14 +122,11 @@
                 "column": 13
               }
             },
-            "range": [
-              12,
-              13
-            ],
             "name": "x"
           }
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/jsx/basic/17/expected.json b/test/fixtures/jsx/basic/17/expected.json
index 29426a6bd6..cf55b33ede 100644
--- a/test/fixtures/jsx/basic/17/expected.json
+++ b/test/fixtures/jsx/basic/17/expected.json
@@ -12,10 +12,6 @@
       "column": 18
     }
   },
-  "range": [
-    0,
-    18
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 18
       }
     },
-    "range": [
-      0,
-      18
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 18
           }
         },
-        "range": [
-          0,
-          18
-        ],
         "expression": {
           "type": "JSXElement",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 18
             }
           },
-          "range": [
-            0,
-            18
-          ],
           "openingElement": {
             "type": "JSXOpeningElement",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 18
               }
             },
-            "range": [
-              0,
-              18
-            ],
             "attributes": [
               {
                 "type": "JSXSpreadAttribute",
@@ -105,10 +85,6 @@
                     "column": 15
                   }
                 },
-                "range": [
-                  5,
-                  15
-                ],
                 "argument": {
                   "type": "Identifier",
                   "start": 9,
@@ -123,10 +99,6 @@
                       "column": 14
                     }
                   },
-                  "range": [
-                    9,
-                    14
-                  ],
                   "name": "props"
                 }
               }
@@ -145,10 +117,6 @@
                   "column": 4
                 }
               },
-              "range": [
-                1,
-                4
-              ],
               "name": "div"
             },
             "selfClosing": true
@@ -158,5 +126,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/jsx/basic/18/expected.json b/test/fixtures/jsx/basic/18/expected.json
index de54d64d2a..9b855ee2d4 100644
--- a/test/fixtures/jsx/basic/18/expected.json
+++ b/test/fixtures/jsx/basic/18/expected.json
@@ -12,10 +12,6 @@
       "column": 35
     }
   },
-  "range": [
-    0,
-    35
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 35
       }
     },
-    "range": [
-      0,
-      35
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 35
           }
         },
-        "range": [
-          0,
-          35
-        ],
         "expression": {
           "type": "JSXElement",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 35
             }
           },
-          "range": [
-            0,
-            35
-          ],
           "openingElement": {
             "type": "JSXOpeningElement",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 35
               }
             },
-            "range": [
-              0,
-              35
-            ],
             "attributes": [
               {
                 "type": "JSXSpreadAttribute",
@@ -105,10 +85,6 @@
                     "column": 15
                   }
                 },
-                "range": [
-                  5,
-                  15
-                ],
                 "argument": {
                   "type": "Identifier",
                   "start": 9,
@@ -123,10 +99,6 @@
                       "column": 14
                     }
                   },
-                  "range": [
-                    9,
-                    14
-                  ],
                   "name": "props"
                 }
               },
@@ -144,10 +116,6 @@
                     "column": 32
                   }
                 },
-                "range": [
-                  16,
-                  32
-                ],
                 "name": {
                   "type": "JSXIdentifier",
                   "start": 16,
@@ -162,10 +130,6 @@
                       "column": 20
                     }
                   },
-                  "range": [
-                    16,
-                    20
-                  ],
                   "name": "post"
                 },
                 "value": {
@@ -182,10 +146,6 @@
                       "column": 32
                     }
                   },
-                  "range": [
-                    21,
-                    32
-                  ],
                   "value": "attribute",
                   "rawValue": "attribute",
                   "raw": "\"attribute\""
@@ -206,10 +166,6 @@
                   "column": 4
                 }
               },
-              "range": [
-                1,
-                4
-              ],
               "name": "div"
             },
             "selfClosing": true
@@ -219,5 +175,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/jsx/basic/19/expected.json b/test/fixtures/jsx/basic/19/expected.json
index 0ff17927c6..2df390efdf 100644
--- a/test/fixtures/jsx/basic/19/expected.json
+++ b/test/fixtures/jsx/basic/19/expected.json
@@ -12,10 +12,6 @@
       "column": 53
     }
   },
-  "range": [
-    0,
-    53
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 53
       }
     },
-    "range": [
-      0,
-      53
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 53
           }
         },
-        "range": [
-          0,
-          53
-        ],
         "expression": {
           "type": "JSXElement",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 53
             }
           },
-          "range": [
-            0,
-            53
-          ],
           "openingElement": {
             "type": "JSXOpeningElement",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 47
               }
             },
-            "range": [
-              0,
-              47
-            ],
             "attributes": [
               {
                 "type": "JSXAttribute",
@@ -105,10 +85,6 @@
                     "column": 18
                   }
                 },
-                "range": [
-                  5,
-                  18
-                ],
                 "name": {
                   "type": "JSXIdentifier",
                   "start": 5,
@@ -123,10 +99,6 @@
                       "column": 8
                     }
                   },
-                  "range": [
-                    5,
-                    8
-                  ],
                   "name": "pre"
                 },
                 "value": {
@@ -143,10 +115,6 @@
                       "column": 18
                     }
                   },
-                  "range": [
-                    9,
-                    18
-                  ],
                   "value": "leading",
                   "rawValue": "leading",
                   "raw": "\"leading\""
@@ -166,10 +134,6 @@
                     "column": 35
                   }
                 },
-                "range": [
-                  19,
-                  35
-                ],
                 "name": {
                   "type": "JSXIdentifier",
                   "start": 19,
@@ -184,10 +148,6 @@
                       "column": 23
                     }
                   },
-                  "range": [
-                    19,
-                    23
-                  ],
                   "name": "pre2"
                 },
                 "value": {
@@ -204,10 +164,6 @@
                       "column": 35
                     }
                   },
-                  "range": [
-                    24,
-                    35
-                  ],
                   "value": "attribute",
                   "rawValue": "attribute",
                   "raw": "\"attribute\""
@@ -227,10 +183,6 @@
                     "column": 46
                   }
                 },
-                "range": [
-                  36,
-                  46
-                ],
                 "argument": {
                   "type": "Identifier",
                   "start": 40,
@@ -245,10 +197,6 @@
                       "column": 45
                     }
                   },
-                  "range": [
-                    40,
-                    45
-                  ],
                   "name": "props"
                 }
               }
@@ -267,10 +215,6 @@
                   "column": 4
                 }
               },
-              "range": [
-                1,
-                4
-              ],
               "name": "div"
             },
             "selfClosing": false
@@ -289,10 +233,6 @@
                 "column": 53
               }
             },
-            "range": [
-              47,
-              53
-            ],
             "name": {
               "type": "JSXIdentifier",
               "start": 49,
@@ -307,10 +247,6 @@
                   "column": 52
                 }
               },
-              "range": [
-                49,
-                52
-              ],
               "name": "div"
             }
           },
@@ -318,5 +254,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/jsx/basic/2/expected.json b/test/fixtures/jsx/basic/2/expected.json
index e1e47a2039..ba17f6adcf 100644
--- a/test/fixtures/jsx/basic/2/expected.json
+++ b/test/fixtures/jsx/basic/2/expected.json
@@ -12,10 +12,6 @@
       "column": 11
     }
   },
-  "range": [
-    0,
-    11
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 11
       }
     },
-    "range": [
-      0,
-      11
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 11
           }
         },
-        "range": [
-          0,
-          11
-        ],
         "expression": {
           "type": "JSXElement",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 11
             }
           },
-          "range": [
-            0,
-            11
-          ],
           "openingElement": {
             "type": "JSXOpeningElement",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 11
               }
             },
-            "range": [
-              0,
-              11
-            ],
             "attributes": [
               {
                 "type": "JSXAttribute",
@@ -105,10 +85,6 @@
                     "column": 8
                   }
                 },
-                "range": [
-                  5,
-                  8
-                ],
                 "name": {
                   "type": "JSXNamespacedName",
                   "start": 5,
@@ -123,10 +99,6 @@
                       "column": 8
                     }
                   },
-                  "range": [
-                    5,
-                    8
-                  ],
                   "namespace": {
                     "type": "JSXIdentifier",
                     "start": 5,
@@ -141,10 +113,6 @@
                         "column": 6
                       }
                     },
-                    "range": [
-                      5,
-                      6
-                    ],
                     "name": "n"
                   },
                   "name": {
@@ -161,10 +129,6 @@
                         "column": 8
                       }
                     },
-                    "range": [
-                      7,
-                      8
-                    ],
                     "name": "v"
                   }
                 },
@@ -185,10 +149,6 @@
                   "column": 4
                 }
               },
-              "range": [
-                1,
-                4
-              ],
               "namespace": {
                 "type": "JSXIdentifier",
                 "start": 1,
@@ -203,10 +163,6 @@
                     "column": 2
                   }
                 },
-                "range": [
-                  1,
-                  2
-                ],
                 "name": "n"
               },
               "name": {
@@ -223,10 +179,6 @@
                     "column": 4
                   }
                 },
-                "range": [
-                  3,
-                  4
-                ],
                 "name": "a"
               }
             },
@@ -237,5 +189,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/jsx/basic/20/expected.json b/test/fixtures/jsx/basic/20/expected.json
index 68238754b6..67be9032eb 100644
--- a/test/fixtures/jsx/basic/20/expected.json
+++ b/test/fixtures/jsx/basic/20/expected.json
@@ -12,10 +12,6 @@
       "column": 52
     }
   },
-  "range": [
-    0,
-    52
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 52
       }
     },
-    "range": [
-      0,
-      52
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 52
           }
         },
-        "range": [
-          0,
-          52
-        ],
         "expression": {
           "type": "JSXElement",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 52
             }
           },
-          "range": [
-            0,
-            52
-          ],
           "openingElement": {
             "type": "JSXOpeningElement",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 31
               }
             },
-            "range": [
-              0,
-              31
-            ],
             "attributes": [
               {
                 "type": "JSXAttribute",
@@ -105,10 +85,6 @@
                     "column": 16
                   }
                 },
-                "range": [
-                  3,
-                  16
-                ],
                 "name": {
                   "type": "JSXIdentifier",
                   "start": 3,
@@ -123,10 +99,6 @@
                       "column": 5
                     }
                   },
-                  "range": [
-                    3,
-                    5
-                  ],
                   "name": "aa"
                 },
                 "value": {
@@ -143,10 +115,6 @@
                       "column": 16
                     }
                   },
-                  "range": [
-                    6,
-                    16
-                  ],
                   "expression": {
                     "type": "MemberExpression",
                     "start": 7,
@@ -161,10 +129,6 @@
                         "column": 15
                       }
                     },
-                    "range": [
-                      7,
-                      15
-                    ],
                     "object": {
                       "type": "MemberExpression",
                       "start": 7,
@@ -179,10 +143,6 @@
                           "column": 12
                         }
                       },
-                      "range": [
-                        7,
-                        12
-                      ],
                       "object": {
                         "type": "Identifier",
                         "start": 7,
@@ -197,10 +157,6 @@
                             "column": 9
                           }
                         },
-                        "range": [
-                          7,
-                          9
-                        ],
                         "name": "aa"
                       },
                       "property": {
@@ -217,10 +173,6 @@
                             "column": 12
                           }
                         },
-                        "range": [
-                          10,
-                          12
-                        ],
                         "name": "bb"
                       },
                       "computed": false
@@ -239,10 +191,6 @@
                           "column": 15
                         }
                       },
-                      "range": [
-                        13,
-                        15
-                      ],
                       "name": "cc"
                     },
                     "computed": false
@@ -263,10 +211,6 @@
                     "column": 30
                   }
                 },
-                "range": [
-                  17,
-                  30
-                ],
                 "name": {
                   "type": "JSXIdentifier",
                   "start": 17,
@@ -281,10 +225,6 @@
                       "column": 19
                     }
                   },
-                  "range": [
-                    17,
-                    19
-                  ],
                   "name": "bb"
                 },
                 "value": {
@@ -301,10 +241,6 @@
                       "column": 30
                     }
                   },
-                  "range": [
-                    20,
-                    30
-                  ],
                   "expression": {
                     "type": "MemberExpression",
                     "start": 21,
@@ -319,10 +255,6 @@
                         "column": 29
                       }
                     },
-                    "range": [
-                      21,
-                      29
-                    ],
                     "object": {
                       "type": "MemberExpression",
                       "start": 21,
@@ -337,10 +269,6 @@
                           "column": 26
                         }
                       },
-                      "range": [
-                        21,
-                        26
-                      ],
                       "object": {
                         "type": "Identifier",
                         "start": 21,
@@ -355,10 +283,6 @@
                             "column": 23
                           }
                         },
-                        "range": [
-                          21,
-                          23
-                        ],
                         "name": "bb"
                       },
                       "property": {
@@ -375,10 +299,6 @@
                             "column": 26
                           }
                         },
-                        "range": [
-                          24,
-                          26
-                        ],
                         "name": "cc"
                       },
                       "computed": false
@@ -397,10 +317,6 @@
                           "column": 29
                         }
                       },
-                      "range": [
-                        27,
-                        29
-                      ],
                       "name": "dd"
                     },
                     "computed": false
@@ -422,10 +338,6 @@
                   "column": 2
                 }
               },
-              "range": [
-                1,
-                2
-              ],
               "name": "A"
             },
             "selfClosing": false
@@ -444,10 +356,6 @@
                 "column": 52
               }
             },
-            "range": [
-              48,
-              52
-            ],
             "name": {
               "type": "JSXIdentifier",
               "start": 50,
@@ -462,10 +370,6 @@
                   "column": 51
                 }
               },
-              "range": [
-                50,
-                51
-              ],
               "name": "A"
             }
           },
@@ -484,10 +388,6 @@
                   "column": 48
                 }
               },
-              "range": [
-                31,
-                48
-              ],
               "openingElement": {
                 "type": "JSXOpeningElement",
                 "start": 31,
@@ -502,10 +402,6 @@
                     "column": 36
                   }
                 },
-                "range": [
-                  31,
-                  36
-                ],
                 "attributes": [],
                 "name": {
                   "type": "JSXIdentifier",
@@ -521,10 +417,6 @@
                       "column": 35
                     }
                   },
-                  "range": [
-                    32,
-                    35
-                  ],
                   "name": "div"
                 },
                 "selfClosing": false
@@ -543,10 +435,6 @@
                     "column": 48
                   }
                 },
-                "range": [
-                  42,
-                  48
-                ],
                 "name": {
                   "type": "JSXIdentifier",
                   "start": 44,
@@ -561,10 +449,6 @@
                       "column": 47
                     }
                   },
-                  "range": [
-                    44,
-                    47
-                  ],
                   "name": "div"
                 }
               },
@@ -583,10 +467,6 @@
                       "column": 42
                     }
                   },
-                  "range": [
-                    36,
-                    42
-                  ],
                   "expression": {
                     "type": "MemberExpression",
                     "start": 37,
@@ -601,10 +481,6 @@
                         "column": 41
                       }
                     },
-                    "range": [
-                      37,
-                      41
-                    ],
                     "object": {
                       "type": "Identifier",
                       "start": 37,
@@ -619,10 +495,6 @@
                           "column": 39
                         }
                       },
-                      "range": [
-                        37,
-                        39
-                      ],
                       "name": "aa"
                     },
                     "property": {
@@ -639,10 +511,6 @@
                           "column": 41
                         }
                       },
-                      "range": [
-                        40,
-                        41
-                      ],
                       "name": "b"
                     },
                     "computed": false
@@ -654,5 +522,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/jsx/basic/3/expected.json b/test/fixtures/jsx/basic/3/expected.json
index a3d398a0a5..15d1dbd2a6 100644
--- a/test/fixtures/jsx/basic/3/expected.json
+++ b/test/fixtures/jsx/basic/3/expected.json
@@ -12,10 +12,6 @@
       "column": 40
     }
   },
-  "range": [
-    0,
-    40
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 40
       }
     },
-    "range": [
-      0,
-      40
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 40
           }
         },
-        "range": [
-          0,
-          40
-        ],
         "expression": {
           "type": "JSXElement",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 40
             }
           },
-          "range": [
-            0,
-            40
-          ],
           "openingElement": {
             "type": "JSXOpeningElement",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 15
               }
             },
-            "range": [
-              0,
-              15
-            ],
             "attributes": [
               {
                 "type": "JSXAttribute",
@@ -105,10 +85,6 @@
                     "column": 14
                   }
                 },
-                "range": [
-                  3,
-                  14
-                ],
                 "name": {
                   "type": "JSXNamespacedName",
                   "start": 3,
@@ -123,10 +99,6 @@
                       "column": 8
                     }
                   },
-                  "range": [
-                    3,
-                    8
-                  ],
                   "namespace": {
                     "type": "JSXIdentifier",
                     "start": 3,
@@ -141,10 +113,6 @@
                         "column": 4
                       }
                     },
-                    "range": [
-                      3,
-                      4
-                    ],
                     "name": "n"
                   },
                   "name": {
@@ -161,10 +129,6 @@
                         "column": 8
                       }
                     },
-                    "range": [
-                      5,
-                      8
-                    ],
                     "name": "foo"
                   }
                 },
@@ -182,10 +146,6 @@
                       "column": 14
                     }
                   },
-                  "range": [
-                    9,
-                    14
-                  ],
                   "value": "bar",
                   "rawValue": "bar",
                   "raw": "\"bar\""
@@ -206,10 +166,6 @@
                   "column": 2
                 }
               },
-              "range": [
-                1,
-                2
-              ],
               "name": "a"
             },
             "selfClosing": false
@@ -228,10 +184,6 @@
                 "column": 40
               }
             },
-            "range": [
-              36,
-              40
-            ],
             "name": {
               "type": "JSXIdentifier",
               "start": 38,
@@ -246,10 +198,6 @@
                   "column": 39
                 }
               },
-              "range": [
-                38,
-                39
-              ],
               "name": "a"
             }
           },
@@ -268,10 +216,6 @@
                   "column": 16
                 }
               },
-              "range": [
-                15,
-                16
-              ],
               "value": " ",
               "rawValue": " ",
               "raw": " "
@@ -290,10 +234,6 @@
                   "column": 23
                 }
               },
-              "range": [
-                16,
-                23
-              ],
               "expression": {
                 "type": "Identifier",
                 "start": 17,
@@ -308,10 +248,6 @@
                     "column": 22
                   }
                 },
-                "range": [
-                  17,
-                  22
-                ],
                 "name": "value"
               }
             },
@@ -329,10 +265,6 @@
                   "column": 24
                 }
               },
-              "range": [
-                23,
-                24
-              ],
               "value": " ",
               "rawValue": " ",
               "raw": " "
@@ -351,10 +283,6 @@
                   "column": 36
                 }
               },
-              "range": [
-                24,
-                36
-              ],
               "openingElement": {
                 "type": "JSXOpeningElement",
                 "start": 24,
@@ -369,10 +297,6 @@
                     "column": 27
                   }
                 },
-                "range": [
-                  24,
-                  27
-                ],
                 "attributes": [],
                 "name": {
                   "type": "JSXIdentifier",
@@ -388,10 +312,6 @@
                       "column": 26
                     }
                   },
-                  "range": [
-                    25,
-                    26
-                  ],
                   "name": "b"
                 },
                 "selfClosing": false
@@ -410,10 +330,6 @@
                     "column": 36
                   }
                 },
-                "range": [
-                  32,
-                  36
-                ],
                 "name": {
                   "type": "JSXIdentifier",
                   "start": 34,
@@ -428,10 +344,6 @@
                       "column": 35
                     }
                   },
-                  "range": [
-                    34,
-                    35
-                  ],
                   "name": "b"
                 }
               },
@@ -450,10 +362,6 @@
                       "column": 32
                     }
                   },
-                  "range": [
-                    27,
-                    32
-                  ],
                   "openingElement": {
                     "type": "JSXOpeningElement",
                     "start": 27,
@@ -468,10 +376,6 @@
                         "column": 32
                       }
                     },
-                    "range": [
-                      27,
-                      32
-                    ],
                     "attributes": [],
                     "name": {
                       "type": "JSXIdentifier",
@@ -487,10 +391,6 @@
                           "column": 29
                         }
                       },
-                      "range": [
-                        28,
-                        29
-                      ],
                       "name": "c"
                     },
                     "selfClosing": true
@@ -504,5 +404,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/jsx/basic/4/expected.json b/test/fixtures/jsx/basic/4/expected.json
index ce3a33801f..7ddfe6f7d3 100644
--- a/test/fixtures/jsx/basic/4/expected.json
+++ b/test/fixtures/jsx/basic/4/expected.json
@@ -12,10 +12,6 @@
       "column": 40
     }
   },
-  "range": [
-    0,
-    40
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 40
       }
     },
-    "range": [
-      0,
-      40
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 40
           }
         },
-        "range": [
-          0,
-          40
-        ],
         "expression": {
           "type": "JSXElement",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 40
             }
           },
-          "range": [
-            0,
-            40
-          ],
           "openingElement": {
             "type": "JSXOpeningElement",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 40
               }
             },
-            "range": [
-              0,
-              40
-            ],
             "attributes": [
               {
                 "type": "JSXAttribute",
@@ -105,10 +85,6 @@
                     "column": 10
                   }
                 },
-                "range": [
-                  3,
-                  10
-                ],
                 "name": {
                   "type": "JSXIdentifier",
                   "start": 3,
@@ -123,10 +99,6 @@
                       "column": 4
                     }
                   },
-                  "range": [
-                    3,
-                    4
-                  ],
                   "name": "b"
                 },
                 "value": {
@@ -143,10 +115,6 @@
                       "column": 10
                     }
                   },
-                  "range": [
-                    5,
-                    10
-                  ],
                   "expression": {
                     "type": "Literal",
                     "start": 6,
@@ -161,10 +129,6 @@
                         "column": 9
                       }
                     },
-                    "range": [
-                      6,
-                      9
-                    ],
                     "value": " ",
                     "rawValue": " ",
                     "raw": "\" \""
@@ -185,10 +149,6 @@
                     "column": 16
                   }
                 },
-                "range": [
-                  11,
-                  16
-                ],
                 "name": {
                   "type": "JSXIdentifier",
                   "start": 11,
@@ -203,10 +163,6 @@
                       "column": 12
                     }
                   },
-                  "range": [
-                    11,
-                    12
-                  ],
                   "name": "c"
                 },
                 "value": {
@@ -223,10 +179,6 @@
                       "column": 16
                     }
                   },
-                  "range": [
-                    13,
-                    16
-                  ],
                   "value": " ",
                   "rawValue": " ",
                   "raw": "\" \""
@@ -246,10 +198,6 @@
                     "column": 26
                   }
                 },
-                "range": [
-                  17,
-                  26
-                ],
                 "name": {
                   "type": "JSXIdentifier",
                   "start": 17,
@@ -264,10 +212,6 @@
                       "column": 18
                     }
                   },
-                  "range": [
-                    17,
-                    18
-                  ],
                   "name": "d"
                 },
                 "value": {
@@ -284,10 +228,6 @@
                       "column": 26
                     }
                   },
-                  "range": [
-                    19,
-                    26
-                  ],
                   "value": "&",
                   "rawValue": "&",
                   "raw": "\"&amp;\""
@@ -307,10 +247,6 @@
                     "column": 37
                   }
                 },
-                "range": [
-                  27,
-                  37
-                ],
                 "name": {
                   "type": "JSXIdentifier",
                   "start": 27,
@@ -325,10 +261,6 @@
                       "column": 28
                     }
                   },
-                  "range": [
-                    27,
-                    28
-                  ],
                   "name": "e"
                 },
                 "value": {
@@ -345,10 +277,6 @@
                       "column": 37
                     }
                   },
-                  "range": [
-                    29,
-                    37
-                  ],
                   "value": "&ampr;",
                   "rawValue": "&ampr;",
                   "raw": "\"&ampr;\""
@@ -369,10 +297,6 @@
                   "column": 2
                 }
               },
-              "range": [
-                1,
-                2
-              ],
               "name": "a"
             },
             "selfClosing": true
@@ -382,5 +306,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/jsx/basic/5/expected.json b/test/fixtures/jsx/basic/5/expected.json
index dfd84d6ca5..a9db746b35 100644
--- a/test/fixtures/jsx/basic/5/expected.json
+++ b/test/fixtures/jsx/basic/5/expected.json
@@ -12,10 +12,6 @@
       "column": 2
     }
   },
-  "range": [
-    0,
-    5
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 2
       }
     },
-    "range": [
-      0,
-      5
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 2
           }
         },
-        "range": [
-          0,
-          5
-        ],
         "expression": {
           "type": "JSXElement",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 2
             }
           },
-          "range": [
-            0,
-            5
-          ],
           "openingElement": {
             "type": "JSXOpeningElement",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 2
               }
             },
-            "range": [
-              0,
-              5
-            ],
             "attributes": [],
             "name": {
               "type": "JSXIdentifier",
@@ -105,10 +85,6 @@
                   "column": 2
                 }
               },
-              "range": [
-                1,
-                2
-              ],
               "name": "a"
             },
             "selfClosing": true
@@ -118,5 +94,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/jsx/basic/6/expected.json b/test/fixtures/jsx/basic/6/expected.json
index d3c61bcd85..94b18bbb71 100644
--- a/test/fixtures/jsx/basic/6/expected.json
+++ b/test/fixtures/jsx/basic/6/expected.json
@@ -12,10 +12,6 @@
       "column": 11
     }
   },
-  "range": [
-    0,
-    11
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 11
       }
     },
-    "range": [
-      0,
-      11
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 11
           }
         },
-        "range": [
-          0,
-          11
-        ],
         "expression": {
           "type": "JSXElement",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 11
             }
           },
-          "range": [
-            0,
-            11
-          ],
           "openingElement": {
             "type": "JSXOpeningElement",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 5
               }
             },
-            "range": [
-              0,
-              5
-            ],
             "attributes": [],
             "name": {
               "type": "JSXIdentifier",
@@ -105,10 +85,6 @@
                   "column": 4
                 }
               },
-              "range": [
-                1,
-                4
-              ],
               "name": "日本語"
             },
             "selfClosing": false
@@ -127,10 +103,6 @@
                 "column": 11
               }
             },
-            "range": [
-              5,
-              11
-            ],
             "name": {
               "type": "JSXIdentifier",
               "start": 7,
@@ -145,10 +117,6 @@
                   "column": 10
                 }
               },
-              "range": [
-                7,
-                10
-              ],
               "name": "日本語"
             }
           },
@@ -156,5 +124,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/jsx/basic/7/expected.json b/test/fixtures/jsx/basic/7/expected.json
index bd57b454d3..ea3c284959 100644
--- a/test/fixtures/jsx/basic/7/expected.json
+++ b/test/fixtures/jsx/basic/7/expected.json
@@ -12,10 +12,6 @@
       "column": 10
     }
   },
-  "range": [
-    0,
-    51
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 10
       }
     },
-    "range": [
-      0,
-      51
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 10
           }
         },
-        "range": [
-          0,
-          51
-        ],
         "expression": {
           "type": "JSXElement",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 10
             }
           },
-          "range": [
-            0,
-            51
-          ],
           "openingElement": {
             "type": "JSXOpeningElement",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 23
               }
             },
-            "range": [
-              0,
-              32
-            ],
             "attributes": [
               {
                 "type": "JSXAttribute",
@@ -105,10 +85,6 @@
                     "column": 22
                   }
                 },
-                "range": [
-                  11,
-                  31
-                ],
                 "name": {
                   "type": "JSXIdentifier",
                   "start": 11,
@@ -123,10 +99,6 @@
                       "column": 6
                     }
                   },
-                  "range": [
-                    11,
-                    15
-                  ],
                   "name": "test"
                 },
                 "value": {
@@ -143,10 +115,6 @@
                       "column": 22
                     }
                   },
-                  "range": [
-                    16,
-                    31
-                  ],
                   "value": "&&",
                   "rawValue": "&&",
                   "raw": "\"&#x0026;&#38;\""
@@ -167,10 +135,6 @@
                   "column": 8
                 }
               },
-              "range": [
-                1,
-                8
-              ],
               "name": "AbC-def"
             },
             "selfClosing": false
@@ -189,10 +153,6 @@
                 "column": 10
               }
             },
-            "range": [
-              41,
-              51
-            ],
             "name": {
               "type": "JSXIdentifier",
               "start": 43,
@@ -207,10 +167,6 @@
                   "column": 9
                 }
               },
-              "range": [
-                43,
-                50
-              ],
               "name": "AbC-def"
             }
           },
@@ -229,10 +185,6 @@
                   "column": 0
                 }
               },
-              "range": [
-                32,
-                41
-              ],
               "value": "\nbar\nbaz\n",
               "rawValue": "\nbar\nbaz\n",
               "raw": "\nbar\nbaz\n"
@@ -241,5 +193,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/jsx/basic/8/expected.json b/test/fixtures/jsx/basic/8/expected.json
index 72157391f6..06bfadfee7 100644
--- a/test/fixtures/jsx/basic/8/expected.json
+++ b/test/fixtures/jsx/basic/8/expected.json
@@ -12,10 +12,6 @@
       "column": 27
     }
   },
-  "range": [
-    0,
-    27
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 27
       }
     },
-    "range": [
-      0,
-      27
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 27
           }
         },
-        "range": [
-          0,
-          27
-        ],
         "expression": {
           "type": "JSXElement",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 27
             }
           },
-          "range": [
-            0,
-            27
-          ],
           "openingElement": {
             "type": "JSXOpeningElement",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 27
               }
             },
-            "range": [
-              0,
-              27
-            ],
             "attributes": [
               {
                 "type": "JSXAttribute",
@@ -105,10 +85,6 @@
                     "column": 24
                   }
                 },
-                "range": [
-                  3,
-                  24
-                ],
                 "name": {
                   "type": "JSXIdentifier",
                   "start": 3,
@@ -123,10 +99,6 @@
                       "column": 4
                     }
                   },
-                  "range": [
-                    3,
-                    4
-                  ],
                   "name": "b"
                 },
                 "value": {
@@ -143,10 +115,6 @@
                       "column": 24
                     }
                   },
-                  "range": [
-                    5,
-                    24
-                  ],
                   "expression": {
                     "type": "ConditionalExpression",
                     "start": 6,
@@ -161,10 +129,6 @@
                         "column": 23
                       }
                     },
-                    "range": [
-                      6,
-                      23
-                    ],
                     "test": {
                       "type": "Identifier",
                       "start": 6,
@@ -179,10 +143,6 @@
                           "column": 7
                         }
                       },
-                      "range": [
-                        6,
-                        7
-                      ],
                       "name": "x"
                     },
                     "consequent": {
@@ -199,10 +159,6 @@
                           "column": 15
                         }
                       },
-                      "range": [
-                        10,
-                        15
-                      ],
                       "openingElement": {
                         "type": "JSXOpeningElement",
                         "start": 10,
@@ -217,10 +173,6 @@
                             "column": 15
                           }
                         },
-                        "range": [
-                          10,
-                          15
-                        ],
                         "attributes": [],
                         "name": {
                           "type": "JSXIdentifier",
@@ -236,10 +188,6 @@
                               "column": 12
                             }
                           },
-                          "range": [
-                            11,
-                            12
-                          ],
                           "name": "c"
                         },
                         "selfClosing": true
@@ -261,10 +209,6 @@
                           "column": 23
                         }
                       },
-                      "range": [
-                        18,
-                        23
-                      ],
                       "openingElement": {
                         "type": "JSXOpeningElement",
                         "start": 18,
@@ -279,10 +223,6 @@
                             "column": 23
                           }
                         },
-                        "range": [
-                          18,
-                          23
-                        ],
                         "attributes": [],
                         "name": {
                           "type": "JSXIdentifier",
@@ -298,10 +238,6 @@
                               "column": 20
                             }
                           },
-                          "range": [
-                            19,
-                            20
-                          ],
                           "name": "d"
                         },
                         "selfClosing": true
@@ -327,10 +263,6 @@
                   "column": 2
                 }
               },
-              "range": [
-                1,
-                2
-              ],
               "name": "a"
             },
             "selfClosing": true
@@ -340,5 +272,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/jsx/basic/9/expected.json b/test/fixtures/jsx/basic/9/expected.json
index cdb79c2c97..3f1a13918e 100644
--- a/test/fixtures/jsx/basic/9/expected.json
+++ b/test/fixtures/jsx/basic/9/expected.json
@@ -12,10 +12,6 @@
       "column": 9
     }
   },
-  "range": [
-    0,
-    9
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 9
       }
     },
-    "range": [
-      0,
-      9
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 9
           }
         },
-        "range": [
-          0,
-          9
-        ],
         "expression": {
           "type": "JSXElement",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 9
             }
           },
-          "range": [
-            0,
-            9
-          ],
           "openingElement": {
             "type": "JSXOpeningElement",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 3
               }
             },
-            "range": [
-              0,
-              3
-            ],
             "attributes": [],
             "name": {
               "type": "JSXIdentifier",
@@ -105,10 +85,6 @@
                   "column": 2
                 }
               },
-              "range": [
-                1,
-                2
-              ],
               "name": "a"
             },
             "selfClosing": false
@@ -127,10 +103,6 @@
                 "column": 9
               }
             },
-            "range": [
-              5,
-              9
-            ],
             "name": {
               "type": "JSXIdentifier",
               "start": 7,
@@ -145,10 +117,6 @@
                   "column": 8
                 }
               },
-              "range": [
-                7,
-                8
-              ],
               "name": "a"
             }
           },
@@ -167,10 +135,6 @@
                   "column": 5
                 }
               },
-              "range": [
-                3,
-                5
-              ],
               "expression": {
                 "type": "JSXEmptyExpression",
                 "start": 4,
@@ -184,16 +148,13 @@
                     "line": 1,
                     "column": 4
                   }
-                },
-                "range": [
-                  4,
-                  4
-                ]
+                }
               }
             }
           ]
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/jsx/regression/1/expected.json b/test/fixtures/jsx/regression/1/expected.json
index 6b2c0dd6ab..b2f8f62b46 100644
--- a/test/fixtures/jsx/regression/1/expected.json
+++ b/test/fixtures/jsx/regression/1/expected.json
@@ -12,10 +12,6 @@
       "column": 40
     }
   },
-  "range": [
-    0,
-    40
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 40
       }
     },
-    "range": [
-      0,
-      40
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 40
           }
         },
-        "range": [
-          0,
-          40
-        ],
         "expression": {
           "type": "JSXElement",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 38
             }
           },
-          "range": [
-            0,
-            38
-          ],
           "openingElement": {
             "type": "JSXOpeningElement",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 3
               }
             },
-            "range": [
-              0,
-              3
-            ],
             "attributes": [],
             "name": {
               "type": "JSXIdentifier",
@@ -105,10 +85,6 @@
                   "column": 2
                 }
               },
-              "range": [
-                1,
-                2
-              ],
               "name": "p"
             },
             "selfClosing": false
@@ -127,10 +103,6 @@
                 "column": 38
               }
             },
-            "range": [
-              34,
-              38
-            ],
             "name": {
               "type": "JSXIdentifier",
               "start": 36,
@@ -145,10 +117,6 @@
                   "column": 37
                 }
               },
-              "range": [
-                36,
-                37
-              ],
               "name": "p"
             }
           },
@@ -167,10 +135,6 @@
                   "column": 7
                 }
               },
-              "range": [
-                3,
-                7
-              ],
               "value": "foo ",
               "rawValue": "foo ",
               "raw": "foo "
@@ -189,10 +153,6 @@
                   "column": 30
                 }
               },
-              "range": [
-                7,
-                30
-              ],
               "openingElement": {
                 "type": "JSXOpeningElement",
                 "start": 7,
@@ -207,10 +167,6 @@
                     "column": 22
                   }
                 },
-                "range": [
-                  7,
-                  22
-                ],
                 "attributes": [
                   {
                     "type": "JSXAttribute",
@@ -226,10 +182,6 @@
                         "column": 21
                       }
                     },
-                    "range": [
-                      10,
-                      21
-                    ],
                     "name": {
                       "type": "JSXIdentifier",
                       "start": 10,
@@ -244,10 +196,6 @@
                           "column": 14
                         }
                       },
-                      "range": [
-                        10,
-                        14
-                      ],
                       "name": "href"
                     },
                     "value": {
@@ -264,10 +212,6 @@
                           "column": 21
                         }
                       },
-                      "range": [
-                        15,
-                        21
-                      ],
                       "value": "test",
                       "rawValue": "test",
                       "raw": "\"test\""
@@ -288,10 +232,6 @@
                       "column": 9
                     }
                   },
-                  "range": [
-                    8,
-                    9
-                  ],
                   "name": "a"
                 },
                 "selfClosing": false
@@ -310,10 +250,6 @@
                     "column": 30
                   }
                 },
-                "range": [
-                  26,
-                  30
-                ],
                 "name": {
                   "type": "JSXIdentifier",
                   "start": 28,
@@ -328,10 +264,6 @@
                       "column": 29
                     }
                   },
-                  "range": [
-                    28,
-                    29
-                  ],
                   "name": "a"
                 }
               },
@@ -350,10 +282,6 @@
                       "column": 26
                     }
                   },
-                  "range": [
-                    22,
-                    26
-                  ],
                   "value": " bar",
                   "rawValue": " bar",
                   "raw": " bar"
@@ -374,10 +302,6 @@
                   "column": 34
                 }
               },
-              "range": [
-                30,
-                34
-              ],
               "value": " baz",
               "rawValue": " baz",
               "raw": " baz"
@@ -386,5 +310,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/jsx/regression/2/expected.json b/test/fixtures/jsx/regression/2/expected.json
index d30c0e52c2..4983e54932 100644
--- a/test/fixtures/jsx/regression/2/expected.json
+++ b/test/fixtures/jsx/regression/2/expected.json
@@ -12,10 +12,6 @@
       "column": 30
     }
   },
-  "range": [
-    0,
-    30
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 30
       }
     },
-    "range": [
-      0,
-      30
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 30
           }
         },
-        "range": [
-          0,
-          30
-        ],
         "expression": {
           "type": "JSXElement",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 30
             }
           },
-          "range": [
-            0,
-            30
-          ],
           "openingElement": {
             "type": "JSXOpeningElement",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 5
               }
             },
-            "range": [
-              0,
-              5
-            ],
             "attributes": [],
             "name": {
               "type": "JSXIdentifier",
@@ -105,10 +85,6 @@
                   "column": 4
                 }
               },
-              "range": [
-                1,
-                4
-              ],
               "name": "div"
             },
             "selfClosing": false
@@ -127,10 +103,6 @@
                 "column": 30
               }
             },
-            "range": [
-              24,
-              30
-            ],
             "name": {
               "type": "JSXIdentifier",
               "start": 26,
@@ -145,10 +117,6 @@
                   "column": 29
                 }
               },
-              "range": [
-                26,
-                29
-              ],
               "name": "div"
             }
           },
@@ -167,10 +135,6 @@
                   "column": 24
                 }
               },
-              "range": [
-                5,
-                24
-              ],
               "expression": {
                 "type": "JSXElement",
                 "start": 6,
@@ -185,10 +149,6 @@
                     "column": 23
                   }
                 },
-                "range": [
-                  6,
-                  23
-                ],
                 "openingElement": {
                   "type": "JSXOpeningElement",
                   "start": 6,
@@ -203,10 +163,6 @@
                       "column": 23
                     }
                   },
-                  "range": [
-                    6,
-                    23
-                  ],
                   "attributes": [
                     {
                       "type": "JSXSpreadAttribute",
@@ -222,10 +178,6 @@
                           "column": 20
                         }
                       },
-                      "range": [
-                        11,
-                        20
-                      ],
                       "argument": {
                         "type": "Identifier",
                         "start": 15,
@@ -240,10 +192,6 @@
                             "column": 19
                           }
                         },
-                        "range": [
-                          15,
-                          19
-                        ],
                         "name": "test"
                       }
                     }
@@ -262,10 +210,6 @@
                         "column": 10
                       }
                     },
-                    "range": [
-                      7,
-                      10
-                    ],
                     "name": "div"
                   },
                   "selfClosing": true
@@ -278,5 +222,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/jsx/regression/3/expected.json b/test/fixtures/jsx/regression/3/expected.json
index 2ed72cf99c..e12dd8c418 100644
--- a/test/fixtures/jsx/regression/3/expected.json
+++ b/test/fixtures/jsx/regression/3/expected.json
@@ -12,10 +12,6 @@
       "column": 18
     }
   },
-  "range": [
-    0,
-    18
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 18
       }
     },
-    "range": [
-      0,
-      18
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 18
           }
         },
-        "range": [
-          0,
-          18
-        ],
         "expression": {
           "type": "JSXElement",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 18
             }
           },
-          "range": [
-            0,
-            18
-          ],
           "openingElement": {
             "type": "JSXOpeningElement",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 5
               }
             },
-            "range": [
-              0,
-              5
-            ],
             "attributes": [],
             "name": {
               "type": "JSXIdentifier",
@@ -105,10 +85,6 @@
                   "column": 4
                 }
               },
-              "range": [
-                1,
-                4
-              ],
               "name": "div"
             },
             "selfClosing": false
@@ -127,10 +103,6 @@
                 "column": 18
               }
             },
-            "range": [
-              12,
-              18
-            ],
             "name": {
               "type": "JSXIdentifier",
               "start": 14,
@@ -145,10 +117,6 @@
                   "column": 17
                 }
               },
-              "range": [
-                14,
-                17
-              ],
               "name": "div"
             }
           },
@@ -167,10 +135,6 @@
                   "column": 12
                 }
               },
-              "range": [
-                5,
-                12
-              ],
               "expression": {
                 "type": "ObjectExpression",
                 "start": 7,
@@ -185,10 +149,6 @@
                     "column": 10
                   }
                 },
-                "range": [
-                  7,
-                  10
-                ],
                 "properties": [
                   {
                     "type": "Property",
@@ -204,10 +164,6 @@
                         "column": 9
                       }
                     },
-                    "range": [
-                      8,
-                      9
-                    ],
                     "method": false,
                     "shorthand": true,
                     "computed": false,
@@ -225,10 +181,6 @@
                           "column": 9
                         }
                       },
-                      "range": [
-                        8,
-                        9
-                      ],
                       "name": "a"
                     },
                     "kind": "init",
@@ -246,10 +198,6 @@
                           "column": 9
                         }
                       },
-                      "range": [
-                        8,
-                        9
-                      ],
                       "name": "a"
                     }
                   }
@@ -260,5 +208,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/jsx/regression/4/expected.json b/test/fixtures/jsx/regression/4/expected.json
index b2a8314854..4d479d7e6f 100644
--- a/test/fixtures/jsx/regression/4/expected.json
+++ b/test/fixtures/jsx/regression/4/expected.json
@@ -12,10 +12,6 @@
       "column": 16
     }
   },
-  "range": [
-    0,
-    16
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 16
       }
     },
-    "range": [
-      0,
-      16
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 16
           }
         },
-        "range": [
-          0,
-          16
-        ],
         "expression": {
           "type": "JSXElement",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 16
             }
           },
-          "range": [
-            0,
-            16
-          ],
           "openingElement": {
             "type": "JSXOpeningElement",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 5
               }
             },
-            "range": [
-              0,
-              5
-            ],
             "attributes": [],
             "name": {
               "type": "JSXIdentifier",
@@ -105,10 +85,6 @@
                   "column": 4
                 }
               },
-              "range": [
-                1,
-                4
-              ],
               "name": "div"
             },
             "selfClosing": false
@@ -127,10 +103,6 @@
                 "column": 16
               }
             },
-            "range": [
-              10,
-              16
-            ],
             "name": {
               "type": "JSXIdentifier",
               "start": 12,
@@ -145,10 +117,6 @@
                   "column": 15
                 }
               },
-              "range": [
-                12,
-                15
-              ],
               "name": "div"
             }
           },
@@ -167,10 +135,6 @@
                   "column": 10
                 }
               },
-              "range": [
-                5,
-                10
-              ],
               "value": "/text",
               "rawValue": "/text",
               "raw": "/text"
@@ -179,5 +143,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/jsx/regression/5/expected.json b/test/fixtures/jsx/regression/5/expected.json
index 54f41461ff..aaf2e26a1d 100644
--- a/test/fixtures/jsx/regression/5/expected.json
+++ b/test/fixtures/jsx/regression/5/expected.json
@@ -12,10 +12,6 @@
       "column": 17
     }
   },
-  "range": [
-    0,
-    17
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 17
       }
     },
-    "range": [
-      0,
-      17
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 17
           }
         },
-        "range": [
-          0,
-          17
-        ],
         "expression": {
           "type": "JSXElement",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 17
             }
           },
-          "range": [
-            0,
-            17
-          ],
           "openingElement": {
             "type": "JSXOpeningElement",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 5
               }
             },
-            "range": [
-              0,
-              5
-            ],
             "attributes": [],
             "name": {
               "type": "JSXIdentifier",
@@ -105,10 +85,6 @@
                   "column": 4
                 }
               },
-              "range": [
-                1,
-                4
-              ],
               "name": "div"
             },
             "selfClosing": false
@@ -127,10 +103,6 @@
                 "column": 17
               }
             },
-            "range": [
-              11,
-              17
-            ],
             "name": {
               "type": "JSXIdentifier",
               "start": 13,
@@ -145,10 +117,6 @@
                   "column": 16
                 }
               },
-              "range": [
-                13,
-                16
-              ],
               "name": "div"
             }
           },
@@ -167,10 +135,6 @@
                   "column": 8
                 }
               },
-              "range": [
-                5,
-                8
-              ],
               "expression": {
                 "type": "Identifier",
                 "start": 6,
@@ -185,10 +149,6 @@
                     "column": 7
                   }
                 },
-                "range": [
-                  6,
-                  7
-                ],
                 "name": "a"
               }
             },
@@ -206,10 +166,6 @@
                   "column": 11
                 }
               },
-              "range": [
-                8,
-                11
-              ],
               "expression": {
                 "type": "Identifier",
                 "start": 9,
@@ -224,10 +180,6 @@
                     "column": 10
                   }
                 },
-                "range": [
-                  9,
-                  10
-                ],
                 "name": "b"
               }
             }
@@ -235,5 +187,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/jsx/regression/6/expected.json b/test/fixtures/jsx/regression/6/expected.json
index 92ee17304c..b259bfb717 100644
--- a/test/fixtures/jsx/regression/6/expected.json
+++ b/test/fixtures/jsx/regression/6/expected.json
@@ -12,10 +12,6 @@
       "column": 32
     }
   },
-  "range": [
-    0,
-    32
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 32
       }
     },
-    "range": [
-      0,
-      32
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 32
           }
         },
-        "range": [
-          0,
-          32
-        ],
         "expression": {
           "type": "JSXElement",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 32
             }
           },
-          "range": [
-            0,
-            32
-          ],
           "openingElement": {
             "type": "JSXOpeningElement",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 32
               }
             },
-            "range": [
-              0,
-              32
-            ],
             "attributes": [
               {
                 "type": "JSXAttribute",
@@ -105,10 +85,6 @@
                     "column": 18
                   }
                 },
-                "range": [
-                  5,
-                  18
-                ],
                 "name": {
                   "type": "JSXIdentifier",
                   "start": 5,
@@ -123,10 +99,6 @@
                       "column": 8
                     }
                   },
-                  "range": [
-                    5,
-                    8
-                  ],
                   "name": "pre"
                 },
                 "value": {
@@ -143,10 +115,6 @@
                       "column": 18
                     }
                   },
-                  "range": [
-                    9,
-                    18
-                  ],
                   "value": "leading",
                   "rawValue": "leading",
                   "raw": "\"leading\""
@@ -166,10 +134,6 @@
                     "column": 29
                   }
                 },
-                "range": [
-                  19,
-                  29
-                ],
                 "argument": {
                   "type": "Identifier",
                   "start": 23,
@@ -184,10 +148,6 @@
                       "column": 28
                     }
                   },
-                  "range": [
-                    23,
-                    28
-                  ],
                   "name": "props"
                 }
               }
@@ -206,10 +166,6 @@
                   "column": 4
                 }
               },
-              "range": [
-                1,
-                4
-              ],
               "name": "div"
             },
             "selfClosing": true
@@ -219,5 +175,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file
diff --git a/test/fixtures/jsx/regression/7/expected.json b/test/fixtures/jsx/regression/7/expected.json
index 0070fec24a..3025ad61b6 100644
--- a/test/fixtures/jsx/regression/7/expected.json
+++ b/test/fixtures/jsx/regression/7/expected.json
@@ -12,10 +12,6 @@
       "column": 17
     }
   },
-  "range": [
-    0,
-    62
-  ],
   "program": {
     "type": "Program",
     "start": 0,
@@ -30,10 +26,6 @@
         "column": 17
       }
     },
-    "range": [
-      0,
-      62
-    ],
     "sourceType": "script",
     "body": [
       {
@@ -50,10 +42,6 @@
             "column": 17
           }
         },
-        "range": [
-          0,
-          62
-        ],
         "expression": {
           "type": "JSXElement",
           "start": 0,
@@ -68,10 +56,6 @@
               "column": 17
             }
           },
-          "range": [
-            0,
-            62
-          ],
           "openingElement": {
             "type": "JSXOpeningElement",
             "start": 0,
@@ -86,10 +70,6 @@
                 "column": 17
               }
             },
-            "range": [
-              0,
-              62
-            ],
             "attributes": [
               {
                 "type": "JSXAttribute",
@@ -105,10 +85,6 @@
                     "column": 15
                   }
                 },
-                "range": [
-                  6,
-                  60
-                ],
                 "name": {
                   "type": "JSXIdentifier",
                   "start": 6,
@@ -123,10 +99,6 @@
                       "column": 7
                     }
                   },
-                  "range": [
-                    6,
-                    7
-                  ],
                   "name": "d"
                 },
                 "value": {
@@ -143,10 +115,6 @@
                       "column": 15
                     }
                   },
-                  "range": [
-                    8,
-                    60
-                  ],
                   "value": "M230 80\n\t\tA 45 45, 0, 1, 0, 275 125\n    L 275 80 Z",
                   "rawValue": "M230 80\n\t\tA 45 45, 0, 1, 0, 275 125\n    L 275 80 Z",
                   "raw": "\"M230 80\n\t\tA 45 45, 0, 1, 0, 275 125\n    L 275 80 Z\""
@@ -167,10 +135,6 @@
                   "column": 5
                 }
               },
-              "range": [
-                1,
-                5
-              ],
               "name": "path"
             },
             "selfClosing": true
@@ -180,5 +144,6 @@
         }
       }
     ]
-  }
+  },
+  "comments": []
 }
\ No newline at end of file