Consolidation of the Upstage library.