Return function improvements, starting to work on N>0-step capturability again.