Finalize initial support for heterogeneous comparisons. Along the lines of N3657, N3421.