Merge "Refactor: Use local variables for editsections in Parser"