issue #19045: Tweak models to handle duplicate checking correctly.