Fix bug in sibling definition
Simplify code path