Redesign/fix indirect/indirect-many-adressed vector wrapper generation