Merge pull request #9083 from bronson/patch-1

avoid using alias in generators
Add FIXME note about the thor bug