Undo extra scoping.
Added test cases to make sure int32/int64's value can not be written to.