More cases added for return expression.