Clean up locator serialized forms

wait I don't understand - are we using `+` or `@`?