More strict equality comparison operator fixes

Even more fixes.