Some tweaks for bug #8355.  It now pulls stuff correctly.