Refactor expression line numbers