Fix a control flow problem in commit rL257277.