Fixes for SBCL and CCL.