Fixed a few more quirks with collapsed nodes.