diff --git a/packages/babel-parser/src/parser/statement.js b/packages/babel-parser/src/parser/statement.js
index 422e564153c7..3eeae6f6b0c6 100644
--- a/packages/babel-parser/src/parser/statement.js
+++ b/packages/babel-parser/src/parser/statement.js
@@ -103,6 +103,7 @@ function babel7CompatTokens(tokens) {
         const backquoteEndLoc = createPositionFromPosition(loc.start, 1);
         let startToken;
         if (value.charCodeAt(0) === charCodes.graveAccent) {
+          // $FlowIgnore: hacky way to create token
           startToken = new Token({
             type: getExportedToken(tt.backQuote),
             value: "`",
@@ -112,6 +113,7 @@ function babel7CompatTokens(tokens) {
             endLoc: backquoteEndLoc,
           });
         } else {
+          // $FlowIgnore: hacky way to create token
           startToken = new Token({
             type: getExportedToken(tt.braceR),
             value: "}",
@@ -127,6 +129,7 @@ function babel7CompatTokens(tokens) {
           templateElementEnd = end - 1;
           templateElementEndLoc = createPositionFromPosition(loc.end, -1);
           templateValue = value.slice(1, -1);
+          // $FlowIgnore: hacky way to create token
           endToken = new Token({
             type: getExportedToken(tt.backQuote),
             value: "`",
@@ -140,6 +143,7 @@ function babel7CompatTokens(tokens) {
           templateElementEnd = end - 2;
           templateElementEndLoc = createPositionFromPosition(loc.end, -2);
           templateValue = value.slice(1, -2);
+          // $FlowIgnore: hacky way to create token
           endToken = new Token({
             type: getExportedToken(tt.dollarBraceL),
             value: "${",
@@ -153,6 +157,7 @@ function babel7CompatTokens(tokens) {
           i,
           1,
           startToken,
+          // $FlowIgnore: hacky way to create token
           new Token({
             type: getExportedToken(tt.template),
             value: templateValue,
diff --git a/packages/babel-parser/src/plugins/jsx/index.js b/packages/babel-parser/src/plugins/jsx/index.js
index b162e54244cf..646431df3e64 100644
--- a/packages/babel-parser/src/plugins/jsx/index.js
+++ b/packages/babel-parser/src/plugins/jsx/index.js
@@ -350,7 +350,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
 
     jsxParseExpressionContainer(
       node: N.JSXExpressionContainer,
-      previousContext: context,
+      previousContext: TokContext,
     ): N.JSXExpressionContainer {
       if (this.match(tt.braceR)) {
         node.expression = this.jsxParseEmptyExpression();
@@ -574,11 +574,6 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       }
     }
 
-    skipSpace() {
-      const curContext = this.curContext();
-      if (!curContext.preserveSpace) super.skipSpace();
-    }
-
     getTokenFromCode(code: number): void {
       const context = this.curContext();