[cvs-nhc98] Fix final display-garbling bugs in the shrink/expand code,