r10387: support new sbcl