HasEntry canonicalize values now, so no need to explicitly do that any more