I've just applied this patch including the input from both Achim and Vladimir (thanks).
I also applied another patches fixing the other cl related build issues mentioned by Achim. The build now succeeds on the latest Emacs without generating any warnings and all tests pass (although it sounds like we could use more test coverage). Thanks, -- Eric Schulte http://cs.unm.edu/~eschulte
