Reworked flight segment-maker.