Step 2: Migrate termination point stuff under the same transact as bridge stuff.