ND2: one more round of fixes for text block parsing