We've historically been writing both of these fields with a fairly long string that requires model type logic to generate. However, we send it over the wire, and it is costing clients non-zero amounts of bandwidth and memory. This is fairly wasteful. While useful for sync-internals, we should strip it off before it gets to the wire for all types.

It is unclear to me how we can best balance getting it to sync-internals while also keeping it in memory for as little time as possible on normal commits.

Note that this is blocked by  issue 714828  which is converting name from required to optional.