Fix Clisp, fixes #147

This PR is based on #152.

With these changes building on Clisp should work again.