Reoganize the state of the example so it's easy to find the relevant
pieces.  Promote inverse relationships to instance state.