Merge "ref: Make vdl generation use Call instead of Context."