remove nested coalton forms

Author: YarinHeffes

Diff for: library/math/integral.lisp

@@ -191,9 +191,10 @@ are floored and truncated division, respectively."
          (lisp ,type (a n) (cl:rem a n)))
        (inline)
        (define (quotRem a n)
-         (lisp (Tuple ,type ,type) (a n)
-           (cl:multiple-value-bind (q r) (cl:truncate a n)
-             (Tuple (coalton (the ,type (fromInt (lisp Integer () q)))) r))))
+         (match (lisp (Tuple Integer ,type) (a n)
+                  (cl:multiple-value-call 'Tuple (cl:truncate a n)))
+           ((Tuple q r)
+            (Tuple (fromInt q) r))))
        (inline)
        (define (div a n)
          (fromInt (lisp Integer (a n) (cl:floor a n))))
@@ -202,9 +203,10 @@ are floored and truncated division, respectively."
          (lisp ,type (a n) (cl:mod a n)))
        (inline)
        (define (divMod a n)
-         (lisp (Tuple ,type ,type) (a n)
-           (cl:multiple-value-bind (d m) (cl:floor a n)
-             (Tuple (coalton (the ,type (fromInt (lisp Integer () d)))) m)))))))
+         (match (lisp (Tuple Integer ,type) (a n)
+                  (cl:multiple-value-call 'Tuple (cl:floor a n)))
+           ((Tuple d m)
+            (Tuple (fromInt d) m)))))))
 
 (cl:defmacro %define-integral-native (type signed)
   (cl:let ((even? (cl:intern (cl:concatenate 'cl:string (cl:symbol-name type) "-EVEN?")))