NH-3638: Cleaned up equality syntax.