still cases where I can break it with my own trees, but it doesn't list superfluous entries with this patch.