minor improvements to form labels

the `LabelOptionsAwareInterface` was introduced in #4677 to preserve BC with 5.3.3, but since the whole functionality will make into 2.3 release and we're upping the minimum PHP version, some cleaning is due.

also minor cleanup subsequent to #5533 and reinstated #5539 new feature