Works on non SBCL lisps again.