diff --git a/Numeric/NumericCoder.hpp b/Numeric/NumericCoder.hpp
index 26f906baa..ab8d48ad8 100644
--- a/Numeric/NumericCoder.hpp
+++ b/Numeric/NumericCoder.hpp
@@ -23,19 +23,20 @@ template <int... Sizes> class NumericCoder {
 		/// Modifies @c target to hold @c value at @c index.
 		template <int index> static void encode(int &target, int value) {
 			static_assert(index < sizeof...(Sizes), "Index must be within range");
-			NumericEncoderImp<Sizes...>::template encode<index, 0, 1>(target, value);
+			NumericEncoder<Sizes...>::template encode<index>(target, value);
 		}
+
 		/// @returns The value from @c source at @c index.
 		template <int index> static int decode(int source) {
 			static_assert(index < sizeof...(Sizes), "Index must be within range");
-			return NumericEncoderImp<Sizes...>::template decode<index, 0, 1>(source);
+			return NumericDecoder<Sizes...>::template decode<index>(source);
 		}
 
 	private:
 
 		template <int size, int... Tail>
-		struct NumericEncoderImp {
-			template <int index, int i, int divider> static void encode(int &target, int value) {
+		struct NumericEncoder {
+			template <int index, int i = 0, int divider = 1> static void encode(int &target, int value) {
 				if constexpr (i == index) {
 					const int suffix = target % divider;
 					target /= divider;
@@ -44,18 +45,20 @@ template <int... Sizes> class NumericCoder {
 					target *= divider;
 					target += suffix;
 				} else {
-					NumericEncoderImp<Tail...>::template encode<index, i+1, divider*size>(target, value);
+					NumericEncoder<Tail...>::template encode<index, i+1, divider*size>(target, value);
 				}
 			}
+		};
 
-			template <int index, int i, int divider> static int decode(int source) {
+		template <int size, int... Tail>
+		struct NumericDecoder {
+			template <int index, int i = 0, int divider = 1> static int decode(int source) {
 				if constexpr (i == index) {
 					return (source / divider) % size;
 				} else {
-					return NumericEncoderImp<Tail...>::template decode<index, i+1, divider*size>(source);
+					return NumericDecoder<Tail...>::template decode<index, i+1, divider*size>(source);
 				}
 			}
-
 		};
 };