Hi Bernhard, what you're doing seems a useful clean-up, thanks. One point for discussion:
-match +static match gfc_match_label (void)
I have generally understood that the gfc_ prefix is for global variables and functions only. We do not always adhere to it (also since some global functions were made static previously), but I think we should stick to it, unless other people think otherwise :-) Best regards Thomas