Fix parsing of match statements