Clean up expression set construction a bit.