Decomposition of expression rule.
Merge with previous changes.