[cvs-nhc98] Some reformatting, and use more efficient version of `line