Hmmmh. I have to think about this -- it will add measurable performance overhead for all use, regardless of whether user actually needs or wants this location information.
It probably would make sense to require explicit enabling of such support, I think.

Second thing: there need to be unit tests to verify that the new functionality works.