Continued work on the move to structured intervals requires us to replace all uses of the legacy format in in origin so we can reclaim the "locator" (and "message") properties for the new structured interval, and stop duplicating a lot of text when we store and upload and process these.