Trigger expression condtructor doesn't work correctly in 1.8.15 and 2.0.3.

Macro cannot insert to expression under some conditions in 1.8.15, and constructor tree is broken when "or" operator is used in 2.0.