Small cleanup around expressions