I don't think this is a new problem in your code, it's just a problem where we never really thought through this combination of features. The right behavior is to restrict set contributions to a single graph. You can't add to a graph from an extension! If you really want that, you can fake it with qualifier annotations.