Add null identifiers to genmatch