I was thinking along the lines of "Hey, I periodically do volunteer work for various charities, and I think this clause could hurt them. Could we add in that work not directly assigned to me and is related to a non-profit / charity is excluded from this clause?"
That way, if anything comes up, you could turn over copyright to the FSF or similar organization and you would be covered.