add 2 and 3 argument versions of for-each
emacs: update imenu regexp