TS-1887: more trivial srcLoc cleanup