Fix vectorize

Fixes:
* type dispatcher ordering
* vectorize in object mode
These commented out lines can be removed, right?