Clean up supervisor result handling some more.
Merge remote-tracking branch 'upstream/master'