Improve circularity test in host-constant-to-core