Fix match expressions in cross compiler.