getCount() now returns a list of <loc, str> pairs per line.
merged conflict