Fix NullVillagerFactory after VillagerFactory refactor of optionals.