Misc fixes to improve multi-return feature #293

Closed prybicki closed 3 months ago