Reorder and document the configure options