Adapt to the logfile using auto-incrementing ids to refer to source locations after mentioning them on first occurrence

Plus some slight cleanup