core: Further emacs23 fixups

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>