diff --git a/.java-version b/.java-version
deleted file mode 100644
index 03b6389f32..0000000000
--- a/.java-version
+++ /dev/null
@@ -1 +0,0 @@
-17.0
diff --git a/rhino/src/main/java/org/mozilla/javascript/IRFactory.java b/rhino/src/main/java/org/mozilla/javascript/IRFactory.java
index eed766d998..3902f95bf3 100644
--- a/rhino/src/main/java/org/mozilla/javascript/IRFactory.java
+++ b/rhino/src/main/java/org/mozilla/javascript/IRFactory.java
@@ -538,9 +538,7 @@ private Node transformElementGet(ElementGet node) {
 
     private Node transformExprStmt(ExpressionStatement node) {
         Node expr = transform(node.getExpression());
-        Node exprStatementNode = new Node(node.getType(), expr);
-        exprStatementNode.setLineColumnNumber(node.getLineno(), node.getColumn());
-        return exprStatementNode;
+        return new Node(node.getType(), expr, node.getLineno(), node.getColumn());
     }
 
     private Node transformForInLoop(ForInLoop loop) {
diff --git a/rhino/src/main/java/org/mozilla/javascript/Parser.java b/rhino/src/main/java/org/mozilla/javascript/Parser.java
index 707e5d57a8..2a1fe44277 100644
--- a/rhino/src/main/java/org/mozilla/javascript/Parser.java
+++ b/rhino/src/main/java/org/mozilla/javascript/Parser.java
@@ -590,7 +590,8 @@ private AstRoot parse() throws IOException {
         AstRoot root = new AstRoot(pos);
         currentScope = currentScriptOrFn = root;
 
-        int baseLineno = prevNameTokenLineno = ts.lineno; // line number where source starts
+        int baseLineno = ts.lineno; // line number where source starts
+        prevNameTokenLineno = ts.getLineno();
         prevNameTokenColumn = ts.getTokenColumn();
         int end = pos; // in case source is empty
 
@@ -1445,7 +1446,6 @@ private IfStatement ifStatement() throws IOException {
         pn.setElsePart(ifFalse);
         pn.setElsePosition(elsePos);
         pn.setLineColumnNumber(lineno, column);
-
         return pn;
     }
 
@@ -2491,7 +2491,6 @@ private AstNode assignExpr() throws IOException {
             if (isNotValidSimpleAssignmentTarget(pn))
                 reportError("msg.syntax.invalid.assignment.lhs");
 
-            Node left = pn;
             pn = new Assignment(tt, pn, assignExpr(), opPos);
 
             if (jsdocNode != null) {
@@ -2901,7 +2900,6 @@ private AstNode memberExpr(boolean allowCallSyntax) throws IOException {
         } else {
             consumeToken();
             int pos = ts.tokenBeg, lineno = lineNumber(), column = columnNumber();
-            ;
             NewExpression nx = new NewExpression(pos);
 
             AstNode target = memberExpr(false);
diff --git a/rhino/src/main/java/org/mozilla/javascript/TokenStream.java b/rhino/src/main/java/org/mozilla/javascript/TokenStream.java
index 6c9b507542..f133ac8f31 100644
--- a/rhino/src/main/java/org/mozilla/javascript/TokenStream.java
+++ b/rhino/src/main/java/org/mozilla/javascript/TokenStream.java
@@ -2452,15 +2452,7 @@ public int getLength() {
     }
 
     public int getTokenColumn() {
-        return getTokenColumn(tokenBeg);
-    }
-
-    /**
-     * @param tokenPosition absolute start of the token position
-     * @return the 1-indexed column
-     */
-    public int getTokenColumn(int tokenPosition) {
-        return tokenPosition - tokenStartLastLineEnd + 1;
+        return tokenBeg - tokenStartLastLineEnd + 1;
     }
 
     // stuff other than whitespace since start of line
diff --git a/rhino/src/main/java/org/mozilla/javascript/ast/InfixExpression.java b/rhino/src/main/java/org/mozilla/javascript/ast/InfixExpression.java
index de60f1cb13..7be56955d4 100644
--- a/rhino/src/main/java/org/mozilla/javascript/ast/InfixExpression.java
+++ b/rhino/src/main/java/org/mozilla/javascript/ast/InfixExpression.java
@@ -94,7 +94,7 @@ public AstNode getLeft() {
     public void setLeft(AstNode left) {
         assertNotNull(left);
         this.left = left;
-        // line number should agree with source position
+        // line and column number should agree with source position
         setLineColumnNumber(left.getLineno(), left.getColumn());
         left.setParent(this);
     }