Ben Boeckel authored 2 months ago and Lucas Givord committed 1 month ago

The `type` value that was just verified as out-of-range is still set
after the block, so instead update it so the single assignment at the
end is shared.

(cherry picked from commit 9c6c952e)