Incidentally, this makes it possible to use model-local variables with either the “block” or “bytecode” option. (Closes: #1243)