Debug info: Further simplify the implementation of buildLocationList by