Redid some of line shortening.