Updates to allow changes to the context subject.  Still a little dicey when doing this in combination with a group node.