Simplify dependencies in generators