Add more code for expression parsing.