[cvs-nhc98] Remove magic numbers as buffer sizes, replace with MAX_STR