fixed manual code to use new Match tasks; contextual references such as
e.m() or e.f do not work currently