Factor out ABI-breaking changes to OPropertySetHelper into a derived
class OPropertySetHelper2.

Only gcc3.map is up-to-date.