Discussed this offline; @atul will summarize conclusions in ENG-6070 and subtasks, but basically we're going to update the ThreadStore type to reflect that only minimally-encoded data are there, and then get rid of (rather than simplify) this branching, as well as all other cases where we branch due to ambiguity in the ThreadStore type