I've read the later books, and now that you mention it I do vaguely remember something about house-elf enslavement cropping up - I think I may only have read the last three books the once, though! I'll be interested to rediscover how she handles it.