Rewrites filtering around join operators

`rhs.solved`->`rhsLeaf.solved`?