enforce resolve ordering to avoid bogus changes when regenerating
without mapping changes