Improve the code about expression handling.