Matching the Lisp for the moment

There are extensions that weren't obvious in the manual, but the test suite
makes it clear.