eliminated the last of the reorder warnings from gcc