Simplify lisp hooks

Use `-each` with a function rather than the macro `--each`; makes
the code cleaner