Note that I don't know anything about server.el, I just did what you
proposed.

Anyway, it fixes the problem - with my setup as well as for -Q.

BTW, I didn't know what was meant with this comment:

| ;; hooks may be specific to current buffer:

so I just removed it.


Michael.