Improve handling of identically-mapped nodes.

Improve display and handling of conflicting nodes in preferred
trees. Automaticically resolve sibling-only conflicts. Clean up old
comments, etc. Fixes #270 (yet again).