Refining the mitigation-based vectorization plan.
Merge branch 'performance' of github.com:dimitriv/Ziria into performance