Clean expressions up a bit.