clean/simplification up of error line number handling.