Improving subtyping of return statements