> Yeah, a PITA this time, but OTOH it's probably good to reorder it once and forever with Geppetto. 

Until another tool has an opinion on what the ordering should be :-). I'd rather tools preserved order to avoid this problem, esp. for content that can be manually changed.