Start of support for object comparisons
tidying up