Use kernel query language for dependencies in sum factorization

Use the upstream changes!