Can we add these to the checkbox as well?  We'll need this anywhere we have a label (because the label will control any element the for attribute matches in the form).

We can do this in a separate PR if you would like.