Exchange: change to context_agent a few other places for work form.  (Doesn't affect existing bug.)