Here is a patch against hotfix to fix warnings about wrong variables names (with Emacs 24). Please test it heavily. Thanks a lot to Martyn Jago for a preliminary set of patches for this!