Change the definition of polyselfless conduct to “You have never intentionally changed form.” If you step on a hitherto unknown polymorph trap and have an uncontrolled polymorph, the conduct is not broken.