Clean up supervisor result handling some more.