emacs: better lock-zone management.
emacs: various fixes