Some minor codecleanings in reorderCNC and reorderDND.