Several minor improvements

The main ones are in the last two commits, fixing two bad regexps and using `edit-server-default-major-mode` again.