drc: try to make some passes not as slow, part 2