Remove circular dependency.
Formatting.
New vis macro version with multiple data target elements.