Add num_first_segment_words argument wherever message creation can occur