Fix regressions caused by const-ify linespec patch: