Tidies/improvements to location usage tracking

Over to you @aplowe to decide what should be included or discarded from this.