I should clarify. When the zombie/skeleton is defeated, I count the remains as both a humanoid body and an undead body. My game has been improved by this ruling.
Animate DeadPHB pg 212
Of course, sometimes the remains are heavily damaged and require mending (the spell, physical repair, or both). It's case by case.