Fixed defining context usage

Previously, only the defining context itself was being returned.  Now,
we separate the bundle being used for the defining context from the
element, which comes from the received context.