Made consistent with final version of vendor.py code.