Fixes #229 by eliminating returns, replacing with locals
Merge pull request #230 from waterbearlang/229_merge_locals_returns

Fixes #229 by eliminating returns, replacing with locals