tighten up entries, to match more closely with what we prune