Refactor and clean up str.format() code (and helpers) in advance of optimizations.
diff --git a/Python/formatter_unicode.c b/Python/formatter_unicode.c
index 114fe30..206b640 100644
--- a/Python/formatter_unicode.c
+++ b/Python/formatter_unicode.c
@@ -3,11 +3,11 @@
of int.__float__, etc., that take and return unicode objects */
#include "Python.h"
-#include "formatter_unicode.h"
-
#include "../Objects/stringlib/unicodedefs.h"
-#define FORMAT_STRING unicode_unicode__format__
-#define FORMAT_LONG unicode_long__format__
-#define FORMAT_FLOAT unicode_float__format__
+
+#define FORMAT_STRING _PyUnicode_FormatAdvanced
+#define FORMAT_LONG _PyLong_FormatAdvanced
+#define FORMAT_FLOAT _PyFloat_FormatAdvanced
+
#include "../Objects/stringlib/formatter.h"