Emacs: Refactor magit recipe and todo for hi-lock.

Refactor magit bindings. Add todo for hi-lock.