Fix union fields. sorts out the addressbook sample, which was broken.