Updated and rebased patches attached. I also reordered them, which
should reduce the number of merge conflicts if the 'lisp.scm' file
changes before they are applied.