My group currently has a necromancer with 5 skeletons and a henchman, a cleric who leaves his henchman at home a lot, a fighter with a fighter henchman, a barbarian, and a druid who shapechanges a lot. Sometimes combat takes a long time. I defaulted to having all NPCs go at the end of combat...