Rename to use line_number everywhere.   THIS COMMIT WAS BOOTSTRAPPED