Changes for DeepComparator (fixes #2)