More work on ASM code matchers