Cleanup persist structures for execution contexts

[bvanessen]

Look at merging all of the individual execution contexts persist states.

[benson31]

This is similar in nature to #1200.