Support pseudo-forks more reliably