More return type fixes for complex lambda expressions