Fixup legacy var detector.