Now it properly handles the situation that p and q may be on
different sheets of the double cover.

[[Imported from SVN: r8367]]