Correct handling of tuples and singular returns