Fix interaction of “predetermined_variables” with “histval” (preprocessor#47)

Also add a corresponding regression test case.

(manually cherry picked from commit 3ec1d151)