Tweaks and bugfixing in the flexible vectorizer.