Clean up locator serialized forms

Sure - that makes sense - guess I thought we had done this initially & wondering why it was changed to not use "@"