audetto and oliverschmidt More line number related changes.