Cleaned up enrich-location module.