Move RuleSet and Agents into a Context object used by both the parser and the expander.