Followup fixes for data defined values for label repeat functions