Bug-fix:

 - Expand mapping list even more during collapse.
 - Re-use up-stream parents info, if available.