preprocessor

Those variables were substituted out by early substitution methods (which are
also called on the original model, for an unknown reason).

Closes: #65

(manually cherry picked from commit d3e11519)