> I find this particular use of a generator difficult to read (it may be the code layout)
I only introduced this generator at the last minute so that I could shorten the line length to be PEP8 complient. I'll have a look at the change you suggest