#include "nit.common.h"
-#define COLOR_nitc__phase__ToolContext___phases 35
+#define COLOR_nitc__phase__ToolContext___phases 38
extern const char FILE_nitc__phase[];
-#define COLOR_nitc__phase__ToolContext___opt_disable_phase 36
-#define COLOR_nitc__phase__ToolContext___opt_sloppy 37
-#define COLOR_nitc__phase___ToolContext___core__kernel__Object__init 152
+#define COLOR_nitc__phase__ToolContext___opt_disable_phase 39
+#define COLOR_nitc__phase__ToolContext___opt_sloppy 40
+#define COLOR_nitc__phase___ToolContext___core__kernel__Object__init 154
#define COLOR_nitc__toolcontext__ToolContext___option_context 15
extern const char FILE_nitc__toolcontext[];
val* NEW_core__Array(const struct type* type);
extern const struct type type_core__Array__opts__Option;
val* NEW_core__NativeArray(int length, const struct type* type);
extern const struct type type_core__NativeArray__opts__Option;
-#define COLOR_core__array__Array__with_native 27
+#define COLOR_core__array__Array__with_native 32
void opts___opts__OptionContext___add_option(val* self, val* p0);
-#define COLOR_nitc__phase___ToolContext___process_options 149
+#define COLOR_nitc__phase___ToolContext___process_options 151
#define COLOR_opts__Option___value 6
val* core___core__AbstractArrayRead___core__abstract_collection__Collection__iterator(val* self);
#define COLOR_core__abstract_collection__Iterator__is_ok 12
#define COLOR_core__abstract_collection__Iterator__item 13
-val* core__flat___NativeString___to_s_full(char* self, long p0, long p1);
+val* core__flat___CString___to_s_unsafe(char* self, val* p0, val* p1, val* p2, val* p3);
#define COLOR_core__kernel__Object___61d_61d 4
val* nitc__phase___ToolContext___phases_list(val* self);
-#define COLOR_core__abstract_collection__Collection__iterator 21
+#define COLOR_core__abstract_collection__Collection__iterator 24
#define COLOR_nitc__phase__Phase___in_hierarchy 1
val* poset___poset__POSetElement___direct_greaters(val* self);
-#define COLOR_core__abstract_collection__Collection__is_empty 20
+#define COLOR_core__abstract_collection__Collection__is_empty 23
void core__file___Sys___print(val* self, val* p0);
extern const struct type type_core__NativeArray__core__String;
#define COLOR_core__abstract_text__Object__to_s 3
-val* core__abstract_text___Collection___join(val* self, val* p0);
+val* core__abstract_text___Collection___join(val* self, val* p0, val* p1);
#define COLOR_core__abstract_text__NativeArray__native_to_s 12
#define COLOR_core__abstract_collection__Iterator__next 14
#define COLOR_core__abstract_collection__Iterator__finish 15
val* nitc___nitc__Phase___core__abstract_text__Object__to_s(val* self);
#define COLOR_nitc__phase__Phase___disabled 3
void nitc___nitc__ToolContext___fatal_error(val* self, val* p0, val* p1);
-#define COLOR_nitc__phase__ToolContext___semantize_is_lazy 40
-#define COLOR_nitc__phase__ToolContext___phases_list 38
+#define COLOR_nitc__phase__ToolContext___semantize_is_lazy 43
+#define COLOR_nitc__phase__ToolContext___phases_list 41
val* core__array___Collection___to_a(val* self);
void core___core__Comparator___sort(val* self, val* p0);
-#define COLOR_nitc__phase__ToolContext___phased_modules 41
-long time___Sys_get_time___impl( struct nitni_instance * self );
+#define COLOR_nitc__phase__ToolContext___phased_modules 44
+#define COLOR_nitc__phase__ToolContext___todo_nmodules 45
+long core__time___Sys_get_time___impl( struct nitni_instance * self );
void nitc___nitc__ToolContext___info(val* self, val* p0, long p1);
+#define COLOR_core__array__Collection__to_a 21
+short int core___core__AbstractArrayRead___core__abstract_collection__Collection__is_empty(val* self);
+val* core___core__AbstractArray___core__abstract_collection__Sequence__shift(val* self);
short int core___core__HashSet___core__abstract_collection__Collection__has(val* self, val* p0);
void core___core__HashSet___core__abstract_collection__SimpleCollection__add(val* self, val* p0);
#define COLOR_nitc__parser_nodes__ANode___location 1
#define COLOR_nitc__parser_nodes__AModule___n_classdefs 12
val* nitc___nitc__ANodes___core__abstract_collection__Collection__iterator(val* self);
#define COLOR_nitc__phase__Phase__process_nclassdef 20
-#define COLOR_nitc__parser_nodes__AClassdef___n_propdefs 10
+#define COLOR_nitc__parser_nodes__AClassdef___n_propdefs 7
void nitc__phase___ToolContext___phase_process_npropdef(val* self, val* p0, val* p1);
#define COLOR_nitc__phase__AnnotationPhaseVisitor___annotations 1
#define COLOR_nitc__parser_nodes__ANode___parent 2
extern const struct type type_core__Int;
extern const char FILE_core__kernel[];
val* core__flat___Int___core__abstract_text__Object__to_s(long self);
-#define COLOR_nitc__phase__Phase__process_npropdef 22
-#define COLOR_nitc__phase__APropdef___is_phased 6
+#define COLOR_nitc__phase__Phase__process_npropdef 23
+#define COLOR_nitc__phase__APropdef___is_phased 4
#define COLOR_nitc__parser_nodes__ANode__visit_all 14
extern const struct type type_nitc__AAnnotation;
void core___core__Array___core__abstract_collection__SimpleCollection__add(val* self, val* p0);
#define COLOR_nitc__phase__Phase___depends 2
-#define COLOR_nitc___nitc__Phase___core__kernel__Object__init 25
+#define COLOR_nitc___nitc__Phase___core__kernel__Object__init 26
val* poset___poset__POSet___add_node(val* self, val* p0);
void poset___poset__POSet___add_edge(val* self, val* p0, val* p1);
val* core__abstract_text___Object___class_name(val* self);
val* core__file___String___strip_extension(val* self, val* p0);
-val* core___core__String___to_snake_case(val* self);
+val* core___core__String___Text__to_snake_case(val* self);