Fixed issue with getting return type from expressions that return variables.