Okay, I think this finally fixes digraph highlighting for good.