1) Dependency loop generation is simplified;
2) An obsolete assertion is removed.