matcher-opcode: compilation fixes.