Fix double-return for begin/ensure/end blocks (#378)