Merge: Improve checking of virtual types