Improve line number reporting