PEP8 fixes.
I decided that generic class-based are more trouble than they are worth, so I'm not going to use them.