Update for new form changes from Apple.