r10361: change sbcl with-lock-held expansion