Hook up js line reporting (and robustness to shifts).
Merge branch 'master' into noblocks

* master:
  Hook up js line reporting (and robustness to shifts).