Correct. The flights credited into W. However, it appears that the SWU is back in my account with a 12/11 expiration, along with the courtesy SWU expiring 12/12, so I'm not complaining.

Another tidbit: to get past security and into the international connections area at NRT you have to show an onward boarding pass or baggage claim stub. I had no such thing; the SFO GA said she couldn't issue it and I'd have to get it at NRT. Here again I got lucky: while on the plane at SFO, I had viewed my (changed) itinerary on rdg12's iPhone app, and the app had stored a copy for offline viewing. I showed this to the security officers, and after much muttering and consulting with each other they let me through.