line(s), _line => ln

As brought up in #2551

In two commits in case there is resistance to renaming the internal functions, or in case I wasn't suppose to mark non-exported things as deprecated.