This feels out of place, should we push this into the schema?

How about another decorator in the publishing pipeline that adds the option labels to the attributes?