As a shot in the dark, does the attached patch fix things for you, or 
affect the symptoms? The idea is to prevent a reset hlinfo from looking 
like it's nonempty. (A fancier possibility would be to add one to 
end_row and end_col everywhere.)