Improved lambda parameter recognition.