Improve expression completion