WIP Mark-related hacks to make emacs more benri - View it on GitHub