I'll need to have a deeper look than my time allows today to be able to answer the question whether I think that there is a more appropriate way (read: a way that upstream is more likely to accept).