Consolidating two of the finalizing steps into one.