fix expression literal clean and expansion