Make BANG_GRAPH_MATCH_STATE wrap OGRAPH_MATCH_STATE

...rather than doing the functorise-the-data fake-inheritance dance.