Add better explanations of why things are failing.

This necessitated fixing some things because they were failing but for
the wrong reason, of course.