Fix nested returns.

Fixes #15763