Properly handle degenerate cases of TREE_OR
TODOify tests that have never yet worked