fixes to lambda for emacs24
labels => cl-labels