Split on escaped returns as well
Merge branch 'escaped_return'