Fix some delegation heuristics.