Don't implicitly depend on invariant unnecessarily
Don't implicitly depend on invariant unnecessarily

(avoid tight coupling; resolve PR comment)

asd-and-Rizzo/ExpressionToCode,EamonNerbonne/ExpressionToCode