Changed arguments to properly resemble the CLISP equivalent.

Still a few minor glitches in testing, ironing those out soonish.