Fix previous patch for SBCL so that patch works on non-SBCL systems