Fix interaction between CSE expansion and iname duplication