contrib/subtree: fix broken &&-chains and revealed test error