Update more functions to use keyid and vcode.