Merge pull request #2692 from Tilka/revert Revert "Interpreter: assign directly instead via variables"