trimming code as I convert to SBCL