Start fleshing out rewrite of return in inline.

Many missing cases to fill out, but captures the overall process.