BS-9998 Fix clean of the return type while erasing expression.