I *am* comfortable with this (note that previously `unmanageNonRecursive` returning false would mean we wouldn't visit any of that entity's children, which is no longer the case here; but the situations where `unmanageNonRecursive` returns false are either "should never happen" or are ok.)