compare singletons by identity not equality (closes #16712)

Patch from Serhiy Storchaka.