Got the esi:when working.  Need more  testing to make sure that the match variables get properly set.