diff --git a/src/stencil/infix.clj b/src/stencil/infix.clj
index 5767ab6a..9a2733db 100644
--- a/src/stencil/infix.clj
+++ b/src/stencil/infix.clj
@@ -76,9 +76,7 @@
   (when (contains? digits (first characters))
     (let [content (string (take-while (set "1234567890._")) characters)
           content (.replaceAll content "_" "")
-          number  (if (some #{\.} content)
-                    (Double/parseDouble content)
-                    (Long/parseLong     content))]
+          number  (if (some #{\.} content) (parse-double content) (parse-long content))]
       [number (drop (count content) characters)])))
 
 (defn- read-ops2 [chars]
diff --git a/version.bb b/version.bb
index 66d6472b..e5cbe482 100644
--- a/version.bb
+++ b/version.bb
@@ -4,9 +4,9 @@
   (when-let [[[_ major minor patch modifier]]
              (seq (re-seq #"(\d+)\.(\d+)\.(\d+)(-SNAPSHOT)?"
                           version))]
-    {:major (Long/parseLong major)
-     :minor (Long/parseLong minor)
-     :patch (Long/parseLong patch)
+    {:major (parse-long major)
+     :minor (parse-long minor)
+     :patch (parse-long patch)
      :modifier (case modifier
                  "-SNAPSHOT" modifier-snapshot
                  nil nil)}))