I thought Andy should have used these Masters events to work on developing a more aggressive style (as did the rest of us, right?), but he chose to go another route...
I think if he could serve at 65% and shorten/ dominate a greater percentage of points, he'd be headed for No. 1. I think he could do both quite easily, and he may do them next week, but if he doesn't I think you're right, he'll be in danger of running himself out of the tournament.