Improve virginity test for engine-defined pieces