Expression usage fixes
Conditional expression generation optimization