Improved <return> handling.