Fixes #1068; Fixes #433 (Hierarchical display of objects!)