removed some lambda->empty() checks