Simplify untyped expressions a bit more.