More edge cases around rewriting returns
1.0.3