Small reporting / exit callback changes

Matches the new test, reports a bit more.

-[Unknown]