Added handling of return to jump-statement