fixup! Switch to using @ to separate key/value pairs in serialized locators