Fixes in rule 4 and 6: use all statements to validate the subtree structure