Refactor expression lists