Refactor thread-join! to use optional args.

* module/srfi/srfi-18.scm (thread-join!): Use optional args.  Also don't
  treat false return values from threads as meaning anything.

module/srfi/srfi-18.scm

@@ -254,15 +254,22 @@
     (threads:cancel-thread thread)
     *unspecified*))
 
-(define (thread-join! thread . args) 
+;; A unique value.
+(define %sentinel (list 1))
+(define* (thread-join! thread #:optional (timeout %sentinel)
+                       (timeoutval %sentinel))
   (with-exception-handlers-here
    (lambda ()
-     (let ((v (apply threads:join-thread thread args))
+     (let ((v (if (eq? timeout %sentinel)
-           (e (thread->exception thread)))
+                  (threads:join-thread thread)
-       (if (and (= (length args) 1) (not v))
+                  (threads:join-thread thread timeout %sentinel))))
-           (srfi-34:raise (condition (&join-timeout-exception))))
+       (cond
-       (if e (srfi-34:raise e))
+        ((eq? v %sentinel)
-       v))))
+         (if (eq? timeoutval %sentinel)
+             (srfi-34:raise (condition (&join-timeout-exception)))
+             timeoutval))
+        ((thread->exception thread) => srfi-34:raise)
+        (else v))))))
 
 ;; MUTEXES
 ;; These functions are all pass-thrus to the existing Guile implementations.