Merge "Fix bug where verification could crash on unresolved types."