diff --git a/src/play_clj/math.clj b/src/play_clj/math.clj
index e2d2fc0..ee572b9 100644
--- a/src/play_clj/math.clj
+++ b/src/play_clj/math.clj
@@ -38,8 +38,7 @@
 
 (defmacro bezier
   [points & options]
-  `(let [^Bezier object# (bezier* ~points)]
-     (u/calls! object# ~@options)))
+  `(u/calls! ^Bezier (bezier* ~points) ~@options))
 
 (defmacro bezier!
   [object k & options]
@@ -53,8 +52,7 @@
 
 (defmacro bresenham2
   [& options]
-  `(let [^Bresenham2 object# (bresenham2*)]
-     (u/calls! object# ~@options)))
+  `(u/calls! ^Bresenham2 (bresenham2*) ~@options))
 
 (defmacro bresenham2!
   [object k & options]
@@ -70,8 +68,7 @@
 
 (defmacro b-spline
   [points degree cont? & options]
-  `(let [^BSpline object# (b-spline* ~points ~degree ~cont?)]
-     (u/calls! object# ~@options)))
+  `(u/calls! ^BSpline (b-spline* ~points ~degree ~cont?) ~@options))
 
 (defmacro b-spline!
   [object k & options]
@@ -87,8 +84,7 @@
 
 (defmacro catmull-rom-spline
   [points cont? & options]
-  `(let [^CatmullRomSpline object# (catmull-rom-spline* ~points ~cont?)]
-     (u/calls! object# ~@options)))
+  `(u/calls! ^CatmullRomSpline (catmull-rom-spline* ~points ~cont?) ~@options))
 
 (defmacro catmull-rom-spline!
   [object k & options]
@@ -104,8 +100,7 @@
 
 (defmacro circle
   [x y radius & options]
-  `(let [^Circle object# (circle* ~x ~y ~radius)]
-     (u/calls! object# ~@options)))
+  `(u/calls! ^Circle (circle* ~x ~y ~radius) ~@options))
 
 (defmacro circle!
   [object k & options]
@@ -119,8 +114,7 @@
 
 (defmacro convex-hull
   [& options]
-  `(let [^ConvexHull object# (convex-hull*)]
-     (u/calls! object# ~@options)))
+  `(u/calls! ^ConvexHull (convex-hull*) ~@options))
 
 (defmacro convex-hull!
   [object k & options]
@@ -134,8 +128,7 @@
 
 (defmacro delaunay-triangulator
   [& options]
-  `(let [^DelaunayTriangulator object# (delaunay-triangulator*)]
-     (u/calls! object# ~@options)))
+  `(u/calls! ^DelaunayTriangulator (delaunay-triangulator*) ~@options))
 
 (defmacro delaunay-triangulator!
   [object k & options]
@@ -149,8 +142,7 @@
 
 (defmacro ear-clipping-triangulator
   [& options]
-  `(let [^EarClippingTriangulator object# (ear-clipping-triangulator*)]
-     (u/calls! object# ~@options)))
+  `(u/calls! ^EarClippingTriangulator (ear-clipping-triangulator*) ~@options))
 
 (defmacro ear-clipping-triangulator!
   [object k & options]
@@ -166,8 +158,7 @@
 
 (defmacro ellipse
   [x y width height & options]
-  `(let [^Ellipse object# (ellipse* ~x ~y ~width ~height)]
-     (u/calls! object# ~@options)))
+  `(u/calls! ^Ellipse (ellipse* ~x ~y ~width ~height) ~@options))
 
 (defmacro ellipse!
   [object k & options]
@@ -181,8 +172,7 @@
 
 (defmacro float-counter
   [window-size & options]
-  `(let [^FloatCounter object# (float-counter* ~window-size)]
-     (u/calls! object# ~@options)))
+  `(u/calls! ^FloatCounter (float-counter* ~window-size) ~@options))
 
 (defmacro float-counter!
   [object k & options]
@@ -196,8 +186,7 @@
 
 (defmacro frustum
   [& options]
-  `(let [^Frustum object# (frustum*)]
-     (u/calls! object# ~@options)))
+  `(u/calls! ^Frustum (frustum*) ~@options))
 
 (defmacro frustum!
   [object k & options]
@@ -211,8 +200,7 @@
 
 (defmacro grid-point-2
   [x y & options]
-  `(let [^GridPoint2 object# (grid-point-2* ~x ~y)]
-     (u/calls! object# ~@options)))
+  `(u/calls! ^GridPoint2 (grid-point-2* ~x ~y) ~@options))
 
 (defmacro grid-point-2!
   [object k & options]
@@ -226,8 +214,7 @@
 
 (defmacro grid-point-3
   [x y z & options]
-  `(let [^GridPoint3 object# (grid-point-3* ~x ~y ~z)]
-     (u/calls! object# ~@options)))
+  `(u/calls! ^GridPoint3 (grid-point-3* ~x ~y ~z) ~@options))
 
 (defmacro grid-point-3!
   [object k & options]
@@ -243,8 +230,7 @@
 
 (defmacro matrix-3
   [values & options]
-  `(let [^Matrix3 object# (matrix-3* ~values)]
-     (u/calls! object# ~@options)))
+  `(u/calls! ^Matrix3 (matrix-3* ~values) ~@options))
 
 (defmacro matrix-3!
   [object k & options]
@@ -260,8 +246,7 @@
 
 (defmacro matrix-4
   [values & options]
-  `(let [^Matrix4 object# (matrix-4* ~values)]
-     (u/calls! object# ~@options)))
+  `(u/calls! ^Matrix4 (matrix-4* ~values) ~@options))
 
 (defmacro matrix-4!
   [object k & options]
@@ -275,8 +260,7 @@
 
 (defmacro plane
   [normal d & options]
-  `(let [^Plane object# (plane* ~normal ~d)]
-     (u/calls! object# ~@options)))
+  `(u/calls! ^Plane (plane* ~normal ~d) ~@options))
 
 (defmacro plane!
   [object k & options]
@@ -292,8 +276,7 @@
 
 (defmacro polygon
   [vertices & options]
-  `(let [^Polygon object# (polygon* ~vertices)]
-     (u/calls! object# ~@options)))
+  `(u/calls! ^Polygon (polygon* ~vertices) ~@options))
 
 (defmacro polygon!
   [object k & options]
@@ -309,8 +292,7 @@
 
 (defmacro polyline
   [vertices & options]
-  `(let [^Polyline object# (polyline* ~vertices)]
-     (u/calls! object# ~@options)))
+  `(u/calls! ^Polyline (polyline* ~vertices) ~@options))
 
 (defmacro polyline!
   [object k & options]
@@ -326,8 +308,7 @@
 
 (defmacro quaternion
   [w x y z & options]
-  `(let [^Quaternion object# (quaternion* ~w ~x ~y ~z)]
-     (u/calls! object# ~@options)))
+  `(u/calls! ^Quaternion (quaternion* ~w ~x ~y ~z) ~@options))
 
 (defmacro quaternion!
   [object k & options]
@@ -343,8 +324,7 @@
 
 (defmacro rectangle
   [x y width height & options]
-  `(let [^Rectangle object# (rectangle* ~x ~y ~width ~height)]
-     (u/calls! object# ~@options)))
+  `(u/calls! ^Rectangle (rectangle* ~x ~y ~width ~height) ~@options))
 
 (defmacro rectangle!
   [object k & options]
@@ -360,8 +340,7 @@
 
 (defmacro vector-2
   [x y & options]
-  `(let [^Vector2 object# (vector-2* ~x ~y)]
-     (u/calls! object# ~@options)))
+  `(u/calls! ^Vector2 (vector-2* ~x ~y) ~@options))
 
 (defmacro vector-2!
   [object k & options]
@@ -377,8 +356,7 @@
 
 (defmacro vector-3
   [x y z & options]
-  `(let [^Vector3 object# (vector-3* ~x ~y ~z)]
-     (u/calls! object# ~@options)))
+  `(u/calls! ^Vector3 (vector-3* ~x ~y ~z) ~@options))
 
 (defmacro vector-3!
   [object k & options]
@@ -392,8 +370,7 @@
 
 (defmacro windowed-mean
   [window-size & options]
-  `(let [^WindowedMean object# (windowed-mean* ~window-size)]
-     (u/calls! object# ~@options)))
+  `(u/calls! ^WindowedMean (windowed-mean* ~window-size) ~@options))
 
 (defmacro windowed-mean!
   [object k & options]