Minor ExpressionMaker cleanup.
Fix some side effect handling bugs.