Make the unvcardize functions work with the new parser