Move flags to the same place they were when cvs2cl was used.