Updates on handling declaration locations