AA finally extended their sale fares for NRT into January ($617 plus tax from SFO--a little higher than the $549 fare running until December, but a lot less than the $1000 that was the fare yesterday), so I booked that today to go along with my award ticket NRT-SIN-NRT. I'll be spending four nights in Tokyo, two before the SIN DO, and two after. Upgrades cleared one way, and I'm waitlisted on the return.