Reorganize heurisch's fix. Return early if x independent.