Fixed another possible cause for 'Bug 13991 - Go to declaration does
not go to correct location in file'.