This is necessary to enforce the documented behavior which says that, if a
variable is not given a value in the endval block, a zero value is assumed.
(cherry picked from commit cf146ec4)