Context#make returns the same context object if the argument is already a Context

When you have a context that is passed into sub organizer-actions, the context that the sub classes act upon are different contexts. Any assignments done on those are not seen in the caller's context.

This fixes it.

Worked on this with @padi