Better resolving and support for empty return expressions.