Merge expr and expression.

This simplifies the PSI tree more.