Refactor Context a tad to use ABC::Context.  Somewhat less elegant than it should be.