#1772: Slight refactor of schema diversification operators to try to fix potential problems with serialization/cloning