Refine the change in r52258 for avoiding use-before-def conditions