Respect "vendor" option in all places.

MFC after:	2 weeks