[FIX] Better detection for circular variable definitions.