Make places that use rules use rule OR-ing

[SekoiaTree]

Removes the TODOs accidentally introduced in the last PR. Whoops. Not sure what happened but. This simplifies the output of some stuff.