Improve expression decomposition