add defun-match and lambda-match, fixes #3