Made consistent with final version of vendor.py code.

@proppy, please check this out and merge.