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 17c6944..4f2e53f 100644
--- a/Python/formatter_unicode.c
+++ b/Python/formatter_unicode.c
@@ -2,12 +2,12 @@
built-in formatter for unicode. That is, unicode.__format__(). */
#include "Python.h"
-#include "formatter_unicode.h"
-
#include "../Objects/stringlib/unicodedefs.h"
-#define FORMAT_STRING unicode__format__
+#define FORMAT_STRING _PyUnicode_FormatAdvanced
+
/* don't define FORMAT_LONG and FORMAT_FLOAT, since we can live
with only the string versions of those. The builtin format()
will convert them to unicode. */
+
#include "../Objects/stringlib/formatter.h"