kabi.c: more cleanup