New inspections.

It's now better than it was, but I still don't like it much. I see two different fixes here - is there a reason to keep them in one class?