Improve verify changes from 4.x

Improve verification of overlapping reference fields when using explicit struct layout.