MAINT: more C code