Updated OrderedDict storage format.

This does two things:

1. Improves ContextMap storage format.

2. Improves TypedOrderedDict storage format.