Remove callback return injection and related.

With paused waits, this is no longer correct.  Callbacks still don't allow
waits inside callbacks yet (they should.)
Merge pull request #5290 from unknownbrackets/callbacks

Remove callback return injection and related