Ongoing refactoring of form controls.