Revert "Issue #16121: Fix line number accounting in shlex"