Adjust forms to use the new WAI-ARIA code