Fix #607, remove return from try when there is a generator inside

Added the contains_yield attr to 'try' when the body it is
wrapping contains 'yeild'.

Should also address #600 and #563