More work on node hierarchies and expansions.