Lint classes better (much better) --- Fixes gh-1940

So, so much better!
Almost. There's another bug that I'll describe in a separate comment. (I was hoping to fix it myself, but since you're available, you can probably do it faster!)