Modify VcardValueParser again...

But it needs to be split.