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

So, so much better!