Clean up form controls slightly.