Let the choice label determine its own label

Don't pass the parent forms label to the choice form label, fixes #22