- rework how Query gets at the Bundle in composite, as we need
__clause_element__() to keep returning a real ClauseElement