Fixing up expression handling.