Correctly replace conflicting distributions in sub-requirements
if possible (instead of only for top-level requirements passed
as arguments).

Fix #1124.