Improvement to composition using sets.
Automated merge for py3k testing