Improved markup for form controls nested within labels