[Logging] Simplifed logger creation.
[Locator] Always wait for Cleanup to complete.
[General] More const-correctness.