Done, I've moved the `empty()` check to `HierarchicalRole`.